diff --git a/.github/actions/debug-wait/action.yaml b/.github/actions/debug-wait/action.yaml
index 58ee86e72..5f15cfa1a 100644
--- a/.github/actions/debug-wait/action.yaml
+++ b/.github/actions/debug-wait/action.yaml
@@ -2,18 +2,15 @@
 name: "Debug wait"
 description: "If debugging is enabled, wait"
 
-inputs:
-  ENABLE_DEBUG:
-    description: enabling debug wait
-    required: true
-    default: "false"
-
 runs:
   using: composite
   steps:
-    - name: Archive artifact logs and data
-      shell: bash
-      run: |-
-          if [ $ENABLE_DEBUG = 'true' ]; then
-            while true; do sleep 10; echo sleep; done
-          fi
+    - name: "Debug: SSH to runner"
+      uses: scality/actions/action-ssh-to-runner@1.6.0
+      continue-on-error: true
+      with:
+        tmate-server-host: ${{ env.TMATE_SERVER_HOST }}
+        tmate-server-port: ${{ env.TMATE_SERVER_PORT }}
+        tmate-server-rsa-fingerprint: ${{ env.TMATE_SERVER_RSA_FINGERPRINT }}
+        tmate-server-ed25519-fingerprint: ${{ env.TMATE_SERVER_ED25519_FINGERPRINT }}
+      if: failure() && runner.debug == '1'
diff --git a/.github/workflows/end2end.yaml b/.github/workflows/end2end.yaml
index 7e73f5c28..d70f77f6e 100644
--- a/.github/workflows/end2end.yaml
+++ b/.github/workflows/end2end.yaml
@@ -107,6 +107,11 @@ env:
   EXPIRE_ONE_DAY_EARLIER: true
   TRANSITION_ONE_DAY_EARLIER: true
   TIME_PROGRESSION_FACTOR: 1
+  # DEBUG WAIT 
+  TMATE_SERVER_HOST: ${{ secrets.TMATE_SERVER_HOST }}
+  TMATE_SERVER_PORT: ${{ secrets.TMATE_SERVER_PORT }}
+  TMATE_SERVER_RSA_FINGERPRINT: ${{ secrets.TMATE_SERVER_RSA_FINGERPRINT }}
+  TMATE_SERVER_ED25519_FINGERPRINT: ${{ secrets.TMATE_SERVER_ED25519_FINGERPRINT }}
 
 jobs:
   check-dashboard-versions:
@@ -423,6 +428,7 @@ jobs:
         working-directory: ./.github/scripts/end2end
       - name: Debug wait
         uses: ./.github/actions/debug-wait
+        timeout-minutes: 60
       - name: Archive artifact logs and data
         uses: ./.github/actions/archive-artifacts
         env:
@@ -490,6 +496,7 @@ jobs:
       #   working-directory: ./.github/scripts/end2end
       - name: Debug wait
         uses: ./.github/actions/debug-wait
+        timeout-minutes: 60
       - name: Archive artifact logs and data
         uses: ./.github/actions/archive-artifacts
         env:
@@ -546,6 +553,7 @@ jobs:
         working-directory: ./.github/scripts/end2end
       - name: Debug wait
         uses: ./.github/actions/debug-wait
+        timeout-minutes: 60
       - name: Archive artifact logs and data
         uses: ./.github/actions/archive-artifacts
         env:
@@ -609,6 +617,7 @@ jobs:
         working-directory: ./.github/scripts/end2end
       - name: Debug wait
         uses: ./.github/actions/debug-wait
+        timeout-minutes: 60
       - name: Archive artifact logs and data
         uses: ./.github/actions/archive-artifacts
         env: