diff --git a/.github/workflows/smoke-copilot.lock.yml b/.github/workflows/smoke-copilot.lock.yml
index d21fb97f..ccb0796b 100644
--- a/.github/workflows/smoke-copilot.lock.yml
+++ b/.github/workflows/smoke-copilot.lock.yml
@@ -3515,6 +3515,15 @@ jobs:
             sudo mv "$AGENT_LOGS_DIR"/* /tmp/gh-aw/sandbox/agent/logs/ || true
             sudo rmdir "$AGENT_LOGS_DIR" || true
           fi
+
+          # Move preserved squid/firewall logs to expected location
+          SQUID_LOGS_DIR="$(find /tmp -maxdepth 1 -type d -name 'squid-logs-*' -print0 2>/dev/null | xargs -0 -r ls -td 2>/dev/null | head -1)"
+          if [ -n "$SQUID_LOGS_DIR" ] && [ -d "$SQUID_LOGS_DIR" ]; then
+            echo "Moving squid logs from $SQUID_LOGS_DIR to /tmp/gh-aw/sandbox/firewall/logs/"
+            sudo mkdir -p /tmp/gh-aw/sandbox/firewall/logs/
+            sudo mv "$SQUID_LOGS_DIR"/* /tmp/gh-aw/sandbox/firewall/logs/ || true
+            sudo rmdir "$SQUID_LOGS_DIR" || true
+          fi
         env:
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN || secrets.COPILOT_CLI_TOKEN  }}
@@ -5854,18 +5863,6 @@ jobs:
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         with:
           script: |
-            function sanitizeWorkflowName(name) {
-
-              return name
-
-                .toLowerCase()
-
-                .replace(/[:\\/\s]/g, "-")
-
-                .replace(/[^a-z0-9._-]/g, "-");
-
-            }
-
             function main() {
 
               const fs = require("fs");
@@ -5874,11 +5871,7 @@ jobs:
 
               try {
 
-                const workflowName = process.env.GITHUB_WORKFLOW || "workflow";
-
-                const sanitizedName = sanitizeWorkflowName(workflowName);
-
-                const squidLogsDir = `/tmp/gh-aw/squid-logs-${sanitizedName}/`;
+                const squidLogsDir = `/tmp/gh-aw/sandbox/firewall/logs/`;
 
                 if (!fs.existsSync(squidLogsDir)) {