diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6e8c80b..3f87fac 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -92,7 +92,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_step == 'build' }}
         with:
           limit-access-to-actor: true
       - name: Retag action for base
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index ec26375..2d7cbc8 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -82,7 +82,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_step == 'cypress' }}
         with:
           limit-access-to-actor: true
       - name: Pull image to prevent build
@@ -131,4 +131,4 @@ jobs:
         uses: mikepenz/action-junit-report@v3
         if: always() # always run even if the previous step fails
         with:
-          report_paths: 'cypress/results/results-*.xml'
\ No newline at end of file
+          report_paths: 'cypress/results/results-*.xml'
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 0da3316..71d6424 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -111,7 +111,7 @@ jobs:
           token: ${{ secrets.CHECKOUT_TOKEN || secrets.GITHUB_TOKEN }}
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_step == 'deploy' }}
         with:
           limit-access-to-actor: true
       - name: Do deploy with solr image
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index e8aefd6..f3514ba 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -81,7 +81,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_step == 'lint' }}
         with:
           limit-access-to-actor: true
       - name: Run Rubocop
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a7b5c6c..add1a82 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -118,7 +118,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_step == 'test' }}
         with:
           limit-access-to-actor: true
       - name: Start containers