diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e8a4db3755..433a411204 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -646,6 +646,10 @@ jobs:
             echo "Sanity check pass for wan logs"
           fi
 
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: always()
+
       # - name: post notification to slack on failure
       #   if: ${{ failure() }}
       #   uses: bryannice/gitactions-slack-notification@2.0.0
@@ -835,6 +839,12 @@ jobs:
             echo "Sanity check pass for wan logs"
           fi
 
+            # Enable tmate debugging of manually-triggered workflows if the input option was provided
+    
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: always()
+
       # - name: post notification to slack on failure
       #   if: ${{ failure() }}
       #   uses: bryannice/gitactions-slack-notification@2.0.0