diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c426c7..81fde53 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -85,6 +85,11 @@ jobs:
           tags: ghcr.io/diracgrid/diracx/services-base:latest
           platforms: linux/amd64,linux/arm64
           build-args: ${{steps.build_base.outputs.digest}}
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
+        with:
+          limit-access-to-actor: true
       - name: Build and push client-base
         uses: docker/build-push-action@v5
         with: