diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 1ce0aa46..1fca5ff4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -36,7 +36,7 @@ body:
       placeholder: |
         When I do X, Y happens...
 
-        Attached is the `kurtosis dump` output...
+        Attached is the `kurtosis enclave dump <enclave-name>` output...
 
         To reproduce,
         1. Run command '...'
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e5e8491e..4fbe9b32 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Dump enclave logs
         if: failure()
-        run: kurtosis dump ./dump
+        run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
       - name: Upload logs
         if: failure()
@@ -150,8 +150,8 @@ jobs:
 
       - name: Dump enclave logs
         if: failure()
-        run: kurtosis dump ./dump
-      
+        run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
+
       - name: Generate archive name
         if: failure()
         run: |
@@ -193,7 +193,7 @@ jobs:
 
       - name: Inspect enclave
         run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
-      
+
       - name: Monitor verified batches (CDK Erigon Permissionless RPC)
         working-directory: .github/scripts
         run: |
@@ -261,7 +261,7 @@ jobs:
 
       - name: Dump enclave logs
         if: failure()
-        run: kurtosis dump ./dump
+        run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
       - name: Upload logs
         if: failure()
@@ -310,7 +310,7 @@ jobs:
           # Restart the agglayer service.
           kurtosis service stop ${{ env.ENCLAVE_NAME }} agglayer
           kurtosis service start ${{ env.ENCLAVE_NAME }} agglayer
-      
+
       - name: Inspect enclave
         run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
 
@@ -330,7 +330,7 @@ jobs:
 
       - name: Dump enclave logs
         if: failure()
-        run: kurtosis dump ./dump
+        run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
       - name: Upload logs
         if: failure()
@@ -338,7 +338,7 @@ jobs:
         with:
           name: dump_attach_ckds_${{ github.run_id }}
           path: ./dump
-  
+
   deploy_to_external_l1:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -359,14 +359,14 @@ jobs:
 
       - name: Install Kurtosis CDK tools
         uses: ./.github/actions/setup-kurtosis-cdk
-      
+
       - name: Deploy L1 chain
         run: kurtosis run --enclave=${{ env.ENCLAVE_NAME }} --args-file=./.github/tests/external-l1/deploy-local-l1.yml .
-      
+
       - name: Deploy to local L1 chain
         run: |
           kurtosis run --enclave=${{ env.ENCLAVE_NAME }} . '{"deployment_stages": {"deploy_l1": false}}'
-      
+
       - name: Inspect enclave
         run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}
 
@@ -379,7 +379,7 @@ jobs:
 
       - name: Dump enclave logs
         if: failure()
-        run: kurtosis dump ./dump
+        run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump
 
       - name: Upload logs
         if: failure()