diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86469f54..11b9ed1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -140,9 +140,6 @@ jobs:
     env:
       TOOLS_PATH: "/opt/tools/bin"
     steps:
-      # Enable Tmate debug ssh session on demand
-      - name: "Setup tmate session"
-        uses: "percona/gh-action-action-tmate@v3"
 
 
       - name: Check out code into the Go module directory
@@ -296,6 +293,11 @@ jobs:
           kubectl delete apiservice v1.packages.operators.coreos.com --ignore-not-found=true
           kubectl get crd -o name | grep .coreos.com$ | awk -F '/' {'print $2'} | xargs --no-run-if-empty kubectl delete crd
 
+      # Enable Tmate debug ssh session on demand
+      - name: "Setup tmate session"
+        uses: "percona/gh-action-action-tmate@v3"
+        if: always()
+
       - name: Scale down cluster
         if: always()
         run: |