diff --git a/.github/workflows/runn-cli-tests.yml b/.github/workflows/runn-cli-tests.yml
index 53252be..e5d8836 100644
--- a/.github/workflows/runn-cli-tests.yml
+++ b/.github/workflows/runn-cli-tests.yml
@@ -97,7 +97,30 @@ jobs:
           UZUMIBI_TEST_BINARY: ${{ github.workspace }}/target/release/uzumibi
           UZUMIBI_TEST_TMPDIR: ${{ runner.temp }}
           UZUMIBI_PROJECT_NAME: test-cloudflare-project-${{ github.run_id }}
-        run: runn run new_cloudflare.yml --verbose
+        run: |
+          mkdir -p runn-diagnostics
+          runn run new_cloudflare.yml --verbose
+
+      - name: Capture Cloudflare failure diagnostics
+        if: failure()
+        working-directory: uzumibi-cli/tests/runn
+        env:
+          RUNN_SCOPES: "read:parent,run:exec"
+          UZUMIBI_TEST_BINARY: ${{ github.workspace }}/target/release/uzumibi
+          UZUMIBI_TEST_TMPDIR: ${{ runner.temp }}
+          UZUMIBI_PROJECT_NAME: test-cloudflare-project-${{ github.run_id }}
+        run: |
+          runn run new_cloudflare.yml --verbose --debug > runn-diagnostics/runn-debug.log 2>&1 || true
+          test -s runn-diagnostics/runn-debug.log
+
+      - name: Upload Cloudflare failure diagnostics
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: runn-cloudflare-diagnostics
+          path: uzumibi-cli/tests/runn/runn-diagnostics/
+          if-no-files-found: ignore
+          retention-days: 7
 
   cloudflare-enable-external-test:
     name: Cloudflare template test (enable-external)
@@ -146,7 +169,31 @@ jobs:
           UZUMIBI_TEST_TMPDIR: ${{ runner.temp }}
           UZUMIBI_NEW_EXTRA_ARGS: "--features enable-external"
           UZUMIBI_PROJECT_NAME: test-cloudflare-project-${{ github.run_id }}
-        run: runn run new_cloudflare.yml --verbose
+        run: |
+          mkdir -p runn-diagnostics
+          runn run new_cloudflare.yml --verbose
+
+      - name: Capture Cloudflare enable-external failure diagnostics
+        if: failure()
+        working-directory: uzumibi-cli/tests/runn
+        env:
+          RUNN_SCOPES: "read:parent,run:exec"
+          UZUMIBI_TEST_BINARY: ${{ github.workspace }}/target/release/uzumibi
+          UZUMIBI_TEST_TMPDIR: ${{ runner.temp }}
+          UZUMIBI_NEW_EXTRA_ARGS: "--features enable-external"
+          UZUMIBI_PROJECT_NAME: test-cloudflare-project-${{ github.run_id }}
+        run: |
+          runn run new_cloudflare.yml --verbose --debug > runn-diagnostics/runn-debug.log 2>&1 || true
+          test -s runn-diagnostics/runn-debug.log
+
+      - name: Upload Cloudflare enable-external failure diagnostics
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: runn-cloudflare-enable-external-diagnostics
+          path: uzumibi-cli/tests/runn/runn-diagnostics/
+          if-no-files-found: ignore
+          retention-days: 7
 
   cloudflare-queue-test:
     name: Cloudflare Queue template test
@@ -194,7 +241,30 @@ jobs:
           UZUMIBI_TEST_BINARY: ${{ github.workspace }}/target/release/uzumibi
           UZUMIBI_TEST_TMPDIR: ${{ runner.temp }}
           UZUMIBI_PROJECT_NAME: test-cloudflare-queue-project-${{ github.run_id }}
-        run: runn run new_cloudflare_queue.yml --verbose
+        run: |
+          mkdir -p runn-diagnostics
+          runn run new_cloudflare_queue.yml --verbose
+
+      - name: Capture Cloudflare Queue failure diagnostics
+        if: failure()
+        working-directory: uzumibi-cli/tests/runn
+        env:
+          RUNN_SCOPES: "read:parent,run:exec"
+          UZUMIBI_TEST_BINARY: ${{ github.workspace }}/target/release/uzumibi
+          UZUMIBI_TEST_TMPDIR: ${{ runner.temp }}
+          UZUMIBI_PROJECT_NAME: test-cloudflare-queue-project-${{ github.run_id }}
+        run: |
+          runn run new_cloudflare_queue.yml --verbose --debug > runn-diagnostics/runn-debug.log 2>&1 || true
+          test -s runn-diagnostics/runn-debug.log
+
+      - name: Upload Cloudflare Queue failure diagnostics
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: runn-cloudflare-queue-diagnostics
+          path: uzumibi-cli/tests/runn/runn-diagnostics/
+          if-no-files-found: ignore
+          retention-days: 7
 
   cloudrun-test:
     name: Cloud Run template test
diff --git a/uzumibi-cli/tests/runn/.gitignore b/uzumibi-cli/tests/runn/.gitignore
new file mode 100644
index 0000000..478b661
--- /dev/null
+++ b/uzumibi-cli/tests/runn/.gitignore
@@ -0,0 +1 @@
+runn-diagnostics/
diff --git a/uzumibi-cli/tests/runn/new_cloudflare.yml b/uzumibi-cli/tests/runn/new_cloudflare.yml
index 49552cb..2e5c680 100644
--- a/uzumibi-cli/tests/runn/new_cloudflare.yml
+++ b/uzumibi-cli/tests/runn/new_cloudflare.yml
@@ -76,7 +76,6 @@ steps:
     desc: Build the WASM app
     exec:
       command: cd {{ vars.tmpdir }}/{{ vars.project_name }}/wasm-app && cargo build --target wasm32-unknown-unknown --release
-    dump: steps
     test: current.exit_code == 0
 
   start_server:
@@ -111,5 +110,4 @@ steps:
     desc: Clean up test directory
     exec:
       command: rm -rf {{ vars.tmpdir }}/{{ vars.project_name }}
-    dump: steps
     test: current.exit_code == 0
diff --git a/uzumibi-cli/tests/runn/new_cloudflare_queue.yml b/uzumibi-cli/tests/runn/new_cloudflare_queue.yml
index da9532d..08a1ab2 100644
--- a/uzumibi-cli/tests/runn/new_cloudflare_queue.yml
+++ b/uzumibi-cli/tests/runn/new_cloudflare_queue.yml
@@ -92,5 +92,4 @@ steps:
     desc: Clean up test directory
     exec:
       command: rm -rf {{ vars.tmpdir }}/{{ vars.project_name }}
-    dump: steps
     test: current.exit_code == 0