diff --git a/aws-lightsail/aider.sh b/aws-lightsail/aider.sh
index bad5113b..a021ee34 100755
--- a/aws-lightsail/aider.sh
+++ b/aws-lightsail/aider.sh
@@ -51,6 +51,7 @@ MODEL_ID="${MODEL_ID:-openrouter/auto}"
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -59,7 +60,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/aws-lightsail/amazonq.sh b/aws-lightsail/amazonq.sh
index c7d8a734..0d770f53 100755
--- a/aws-lightsail/amazonq.sh
+++ b/aws-lightsail/amazonq.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/aws-lightsail/claude.sh b/aws-lightsail/claude.sh
index f1e463ce..b772db32 100755
--- a/aws-lightsail/claude.sh
+++ b/aws-lightsail/claude.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -60,7 +61,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Configure Claude Code settings
 setup_claude_code_config "${OPENROUTER_API_KEY}" \
diff --git a/aws-lightsail/cline.sh b/aws-lightsail/cline.sh
index 28d69802..1f157544 100755
--- a/aws-lightsail/cline.sh
+++ b/aws-lightsail/cline.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/aws-lightsail/codex.sh b/aws-lightsail/codex.sh
index 25d1210a..f2c111aa 100755
--- a/aws-lightsail/codex.sh
+++ b/aws-lightsail/codex.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/aws-lightsail/gemini.sh b/aws-lightsail/gemini.sh
index d702d6cd..163eaced 100755
--- a/aws-lightsail/gemini.sh
+++ b/aws-lightsail/gemini.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -55,7 +56,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/aws-lightsail/goose.sh b/aws-lightsail/goose.sh
index abf14612..679b463a 100755
--- a/aws-lightsail/goose.sh
+++ b/aws-lightsail/goose.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -53,7 +54,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/aws-lightsail/interpreter.sh b/aws-lightsail/interpreter.sh
index 1d4c9da8..154bd548 100755
--- a/aws-lightsail/interpreter.sh
+++ b/aws-lightsail/interpreter.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/aws-lightsail/nanoclaw.sh b/aws-lightsail/nanoclaw.sh
index c96ccbef..3c4bf009 100755
--- a/aws-lightsail/nanoclaw.sh
+++ b/aws-lightsail/nanoclaw.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LIGHTSAIL_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Create nanoclaw .env file
 log_warn "Configuring nanoclaw..."
@@ -68,7 +68,6 @@ ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 upload_file "${LIGHTSAIL_SERVER_IP}" "${DOTENV_TEMP}" "/home/ubuntu/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "Lightsail instance setup completed successfully!"
diff --git a/digitalocean/amazonq.sh b/digitalocean/amazonq.sh
index cdc5419b..64cfdb77 100755
--- a/digitalocean/amazonq.sh
+++ b/digitalocean/amazonq.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -42,7 +43,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${DO_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${DO_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "DigitalOcean droplet setup completed successfully!"
diff --git a/digitalocean/cline.sh b/digitalocean/cline.sh
index ea73f7a3..2b98f709 100755
--- a/digitalocean/cline.sh
+++ b/digitalocean/cline.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -42,7 +43,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${DO_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${DO_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "DigitalOcean droplet setup completed successfully!"
diff --git a/digitalocean/gemini.sh b/digitalocean/gemini.sh
index 00d46e7d..d3394adb 100755
--- a/digitalocean/gemini.sh
+++ b/digitalocean/gemini.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -43,7 +44,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${DO_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${DO_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "DigitalOcean droplet setup completed successfully!"
diff --git a/digitalocean/nanoclaw.sh b/digitalocean/nanoclaw.sh
index 7b3d2025..fcf0fb50 100755
--- a/digitalocean/nanoclaw.sh
+++ b/digitalocean/nanoclaw.sh
@@ -53,13 +53,13 @@ inject_env_vars_ssh "${DO_SERVER_IP}" upload_file run_server \
 log_warn "Configuring nanoclaw..."
 
 DOTENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 chmod 600 "${DOTENV_TEMP}"
 cat > "${DOTENV_TEMP}" << EOF
 ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 upload_file "${DO_SERVER_IP}" "${DOTENV_TEMP}" "/root/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "DigitalOcean droplet setup completed successfully!"
diff --git a/e2b/aider.sh b/e2b/aider.sh
index 7b4c4786..61074cca 100755
--- a/e2b/aider.sh
+++ b/e2b/aider.sh
@@ -48,6 +48,7 @@ MODEL_ID="${MODEL_ID:-openrouter/auto}"
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -56,7 +57,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/amazonq.sh b/e2b/amazonq.sh
index 8fdeeb64..2da98838 100755
--- a/e2b/amazonq.sh
+++ b/e2b/amazonq.sh
@@ -41,6 +41,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -51,7 +52,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/claude.sh b/e2b/claude.sh
index d1fa4a57..89a5e9a2 100755
--- a/e2b/claude.sh
+++ b/e2b/claude.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 7. Configure Claude Code settings
 setup_claude_code_config "${OPENROUTER_API_KEY}" \
diff --git a/e2b/cline.sh b/e2b/cline.sh
index ce5073e7..8fcb90e1 100755
--- a/e2b/cline.sh
+++ b/e2b/cline.sh
@@ -41,6 +41,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -51,7 +52,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/codex.sh b/e2b/codex.sh
index 20e360a5..f41b6765 100755
--- a/e2b/codex.sh
+++ b/e2b/codex.sh
@@ -41,6 +41,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -51,7 +52,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/gemini.sh b/e2b/gemini.sh
index 57612f27..adfe569e 100755
--- a/e2b/gemini.sh
+++ b/e2b/gemini.sh
@@ -41,6 +41,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -52,7 +53,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/goose.sh b/e2b/goose.sh
index 5a795185..b8cc9ae5 100755
--- a/e2b/goose.sh
+++ b/e2b/goose.sh
@@ -41,6 +41,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -50,7 +51,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/interpreter.sh b/e2b/interpreter.sh
index e31a493c..99f2d4f0 100755
--- a/e2b/interpreter.sh
+++ b/e2b/interpreter.sh
@@ -41,6 +41,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -51,7 +52,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/nanoclaw.sh b/e2b/nanoclaw.sh
index f7646640..9a54c938 100755
--- a/e2b/nanoclaw.sh
+++ b/e2b/nanoclaw.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 7. Create nanoclaw .env file
 log_warn "Configuring nanoclaw..."
@@ -65,7 +65,6 @@ ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 upload_file "${DOTENV_TEMP}" ~/nanoclaw/.env
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "E2B sandbox setup completed successfully!"
diff --git a/e2b/openclaw.sh b/e2b/openclaw.sh
index af365cd1..1f275fc1 100755
--- a/e2b/openclaw.sh
+++ b/e2b/openclaw.sh
@@ -44,6 +44,7 @@ MODEL_ID=$(get_model_id_interactive "openrouter/auto" "Openclaw") || exit 1
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Configure openclaw
 setup_openclaw_config "${OPENROUTER_API_KEY}" "${MODEL_ID}" \
diff --git a/gcp/aider.sh b/gcp/aider.sh
index 1584c0e2..017037e8 100755
--- a/gcp/aider.sh
+++ b/gcp/aider.sh
@@ -51,6 +51,7 @@ MODEL_ID="${MODEL_ID:-openrouter/auto}"
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -59,7 +60,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/gcp/amazonq.sh b/gcp/amazonq.sh
index 85bc62b9..b1926335 100755
--- a/gcp/amazonq.sh
+++ b/gcp/amazonq.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/gcp/claude.sh b/gcp/claude.sh
index c97f7c82..2a788e18 100755
--- a/gcp/claude.sh
+++ b/gcp/claude.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -60,7 +61,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Configure Claude Code settings
 setup_claude_code_config "${OPENROUTER_API_KEY}" \
diff --git a/gcp/cline.sh b/gcp/cline.sh
index 26cbdae7..1147e022 100755
--- a/gcp/cline.sh
+++ b/gcp/cline.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/gcp/codex.sh b/gcp/codex.sh
index 255b6aaf..0403a3d2 100755
--- a/gcp/codex.sh
+++ b/gcp/codex.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/gcp/gemini.sh b/gcp/gemini.sh
index 93e6c741..5eac4532 100755
--- a/gcp/gemini.sh
+++ b/gcp/gemini.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -55,7 +56,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/gcp/goose.sh b/gcp/goose.sh
index 8e831eb3..d967e523 100755
--- a/gcp/goose.sh
+++ b/gcp/goose.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -53,7 +54,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/gcp/interpreter.sh b/gcp/interpreter.sh
index a8901b1d..5eb2e6f6 100755
--- a/gcp/interpreter.sh
+++ b/gcp/interpreter.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/gcp/nanoclaw.sh b/gcp/nanoclaw.sh
index 5c44f004..fae1f51b 100755
--- a/gcp/nanoclaw.sh
+++ b/gcp/nanoclaw.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${GCP_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${GCP_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Create nanoclaw .env file
 log_warn "Configuring nanoclaw..."
@@ -68,7 +68,6 @@ ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 upload_file "${GCP_SERVER_IP}" "${DOTENV_TEMP}" "${HOME}/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "GCP instance setup completed successfully!"
diff --git a/hetzner/amazonq.sh b/hetzner/amazonq.sh
index 7c0aa667..652c4a2d 100755
--- a/hetzner/amazonq.sh
+++ b/hetzner/amazonq.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -42,7 +43,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${HETZNER_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${HETZNER_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Hetzner server setup completed successfully!"
diff --git a/hetzner/cline.sh b/hetzner/cline.sh
index b4178bef..e0c34033 100755
--- a/hetzner/cline.sh
+++ b/hetzner/cline.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -42,7 +43,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${HETZNER_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${HETZNER_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Hetzner server setup completed successfully!"
diff --git a/hetzner/gemini.sh b/hetzner/gemini.sh
index 413973fe..534666db 100755
--- a/hetzner/gemini.sh
+++ b/hetzner/gemini.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -43,7 +44,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${HETZNER_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${HETZNER_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Hetzner server setup completed successfully!"
diff --git a/hetzner/nanoclaw.sh b/hetzner/nanoclaw.sh
index 1471f571..dbf5391f 100755
--- a/hetzner/nanoclaw.sh
+++ b/hetzner/nanoclaw.sh
@@ -53,13 +53,13 @@ inject_env_vars_ssh "${HETZNER_SERVER_IP}" upload_file run_server \
 log_warn "Configuring nanoclaw..."
 
 DOTENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 chmod 600 "${DOTENV_TEMP}"
 cat > "${DOTENV_TEMP}" << EOF
 ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 upload_file "${HETZNER_SERVER_IP}" "${DOTENV_TEMP}" "/root/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "Hetzner server setup completed successfully!"
diff --git a/lambda/aider.sh b/lambda/aider.sh
index 3294a646..7363da1d 100755
--- a/lambda/aider.sh
+++ b/lambda/aider.sh
@@ -51,6 +51,7 @@ MODEL_ID="${MODEL_ID:-openrouter/auto}"
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -59,7 +60,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/lambda/amazonq.sh b/lambda/amazonq.sh
index 83bdb613..2e2044ab 100755
--- a/lambda/amazonq.sh
+++ b/lambda/amazonq.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/lambda/claude.sh b/lambda/claude.sh
index 09e40af5..d1a27b07 100755
--- a/lambda/claude.sh
+++ b/lambda/claude.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -60,7 +61,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Configure Claude Code settings
 setup_claude_code_config "${OPENROUTER_API_KEY}" \
diff --git a/lambda/cline.sh b/lambda/cline.sh
index 5a69244e..12676885 100755
--- a/lambda/cline.sh
+++ b/lambda/cline.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/lambda/codex.sh b/lambda/codex.sh
index 82d4863f..109e893b 100755
--- a/lambda/codex.sh
+++ b/lambda/codex.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/lambda/gemini.sh b/lambda/gemini.sh
index bc27dc57..1c2de9c7 100755
--- a/lambda/gemini.sh
+++ b/lambda/gemini.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -55,7 +56,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/lambda/goose.sh b/lambda/goose.sh
index 1514528e..10990ec0 100755
--- a/lambda/goose.sh
+++ b/lambda/goose.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -53,7 +54,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/lambda/interpreter.sh b/lambda/interpreter.sh
index 71b03ad0..2505893b 100755
--- a/lambda/interpreter.sh
+++ b/lambda/interpreter.sh
@@ -44,6 +44,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -54,7 +55,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/lambda/nanoclaw.sh b/lambda/nanoclaw.sh
index 7b5b0cc5..5fb4b904 100755
--- a/lambda/nanoclaw.sh
+++ b/lambda/nanoclaw.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LAMBDA_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Create nanoclaw .env file
 log_warn "Configuring nanoclaw..."
@@ -68,7 +68,6 @@ ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 upload_file "${LAMBDA_SERVER_IP}" "${DOTENV_TEMP}" "/home/ubuntu/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "Lambda Cloud instance setup completed successfully!"
diff --git a/linode/amazonq.sh b/linode/amazonq.sh
index 3c3172cd..7da99cf0 100755
--- a/linode/amazonq.sh
+++ b/linode/amazonq.sh
@@ -20,6 +20,7 @@ if [[ -n "${OPENROUTER_API_KEY:-}" ]]; then log_info "Using OpenRouter API key f
 else OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180); fi
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -29,7 +30,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${LINODE_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LINODE_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 echo ""
 log_info "Linode setup completed successfully!"
 echo ""
diff --git a/linode/cline.sh b/linode/cline.sh
index 91ea8f30..897bdfb2 100755
--- a/linode/cline.sh
+++ b/linode/cline.sh
@@ -20,6 +20,7 @@ if [[ -n "${OPENROUTER_API_KEY:-}" ]]; then log_info "Using OpenRouter API key f
 else OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180); fi
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -29,7 +30,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${LINODE_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LINODE_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 echo ""
 log_info "Linode setup completed successfully!"
 echo ""
diff --git a/linode/gemini.sh b/linode/gemini.sh
index cfd863a7..47bd36fe 100755
--- a/linode/gemini.sh
+++ b/linode/gemini.sh
@@ -20,6 +20,7 @@ if [[ -n "${OPENROUTER_API_KEY:-}" ]]; then log_info "Using OpenRouter API key f
 else OPENROUTER_API_KEY=$(get_openrouter_api_key_oauth 5180); fi
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -30,7 +31,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${LINODE_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${LINODE_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 echo ""
 log_info "Linode setup completed successfully!"
 echo ""
diff --git a/linode/nanoclaw.sh b/linode/nanoclaw.sh
index 56d3da1d..86d68674 100755
--- a/linode/nanoclaw.sh
+++ b/linode/nanoclaw.sh
@@ -27,12 +27,12 @@ inject_env_vars_ssh "${LINODE_SERVER_IP}" upload_file run_server \
     "ANTHROPIC_BASE_URL=https://openrouter.ai/api"
 log_warn "Configuring nanoclaw..."
 DOTENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 chmod 600 "${DOTENV_TEMP}"
 cat > "${DOTENV_TEMP}" << EOF
 ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 upload_file "${LINODE_SERVER_IP}" "${DOTENV_TEMP}" "/root/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 echo ""
 log_info "Linode setup completed successfully!"
 echo ""
diff --git a/modal/aider.sh b/modal/aider.sh
index d806f35a..f2883ed6 100755
--- a/modal/aider.sh
+++ b/modal/aider.sh
@@ -54,6 +54,7 @@ MODEL_ID="${MODEL_ID:-openrouter/auto}"
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -62,7 +63,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/amazonq.sh b/modal/amazonq.sh
index 229f3305..26822d49 100755
--- a/modal/amazonq.sh
+++ b/modal/amazonq.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/claude.sh b/modal/claude.sh
index 227f773d..907215fe 100755
--- a/modal/claude.sh
+++ b/modal/claude.sh
@@ -50,6 +50,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -63,7 +64,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 7. Configure Claude Code settings
 setup_claude_code_config "${OPENROUTER_API_KEY}" \
diff --git a/modal/cline.sh b/modal/cline.sh
index 46c02679..3314bcb4 100755
--- a/modal/cline.sh
+++ b/modal/cline.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/codex.sh b/modal/codex.sh
index 9e7d6c93..7e2d7c53 100755
--- a/modal/codex.sh
+++ b/modal/codex.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/gemini.sh b/modal/gemini.sh
index 3c64d116..a5a7e471 100755
--- a/modal/gemini.sh
+++ b/modal/gemini.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -58,7 +59,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/goose.sh b/modal/goose.sh
index 271bbbee..242f042b 100755
--- a/modal/goose.sh
+++ b/modal/goose.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -56,7 +57,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/interpreter.sh b/modal/interpreter.sh
index 4b49d968..b203626e 100755
--- a/modal/interpreter.sh
+++ b/modal/interpreter.sh
@@ -47,6 +47,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -57,7 +58,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/nanoclaw.sh b/modal/nanoclaw.sh
index 75fefedf..b2c64366 100755
--- a/modal/nanoclaw.sh
+++ b/modal/nanoclaw.sh
@@ -50,6 +50,7 @@ fi
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -60,7 +61,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 7. Create nanoclaw .env file
 log_warn "Configuring nanoclaw..."
@@ -71,7 +71,6 @@ ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 upload_file "${DOTENV_TEMP}" ~/nanoclaw/.env
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "Modal sandbox setup completed successfully!"
diff --git a/modal/openclaw.sh b/modal/openclaw.sh
index 1bdd6f4a..6651bce1 100755
--- a/modal/openclaw.sh
+++ b/modal/openclaw.sh
@@ -50,6 +50,7 @@ MODEL_ID=$(get_model_id_interactive "openrouter/auto" "Openclaw") || exit 1
 log_warn "Setting up environment variables..."
 
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -60,7 +61,6 @@ EOF
 
 upload_file "${ENV_TEMP}" "/tmp/env_config"
 run_server "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 # 8. Configure openclaw
 setup_openclaw_config "${OPENROUTER_API_KEY}" "${MODEL_ID}" \
diff --git a/sprite/amazonq.sh b/sprite/amazonq.sh
index dc72f446..a50459dd 100755
--- a/sprite/amazonq.sh
+++ b/sprite/amazonq.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -41,7 +42,6 @@ export OPENAI_API_KEY="${OPENROUTER_API_KEY}"
 export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 sprite exec -s "${SPRITE_NAME}" -file "${ENV_TEMP}:/tmp/env_config" -- bash -c "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Sprite setup completed successfully!"
diff --git a/sprite/cline.sh b/sprite/cline.sh
index 6b87e01f..4f01aba0 100755
--- a/sprite/cline.sh
+++ b/sprite/cline.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -41,7 +42,6 @@ export OPENAI_API_KEY="${OPENROUTER_API_KEY}"
 export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 sprite exec -s "${SPRITE_NAME}" -file "${ENV_TEMP}:/tmp/env_config" -- bash -c "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Sprite setup completed successfully!"
diff --git a/sprite/gemini.sh b/sprite/gemini.sh
index 9908ef23..d42156af 100755
--- a/sprite/gemini.sh
+++ b/sprite/gemini.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -42,7 +43,6 @@ export OPENAI_API_KEY="${OPENROUTER_API_KEY}"
 export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 sprite exec -s "${SPRITE_NAME}" -file "${ENV_TEMP}:/tmp/env_config" -- bash -c "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Sprite setup completed successfully!"
diff --git a/sprite/nanoclaw.sh b/sprite/nanoclaw.sh
index 7b6325b6..28b26274 100644
--- a/sprite/nanoclaw.sh
+++ b/sprite/nanoclaw.sh
@@ -47,13 +47,13 @@ inject_env_vars_sprite "${SPRITE_NAME}" \
 log_warn "Configuring nanoclaw..."
 
 DOTENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 chmod 600 "${DOTENV_TEMP}"
 cat > "${DOTENV_TEMP}" << EOF
 ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 
 sprite exec -s "${SPRITE_NAME}" -file "${DOTENV_TEMP}:/tmp/nanoclaw_env" -- bash -c "mv /tmp/nanoclaw_env ~/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "✅ Sprite setup completed successfully!"
diff --git a/vultr/amazonq.sh b/vultr/amazonq.sh
index cbbb1ae0..874977be 100755
--- a/vultr/amazonq.sh
+++ b/vultr/amazonq.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -42,7 +43,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${VULTR_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${VULTR_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Vultr instance setup completed successfully!"
diff --git a/vultr/cline.sh b/vultr/cline.sh
index 23e350c2..f563f70b 100755
--- a/vultr/cline.sh
+++ b/vultr/cline.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -42,7 +43,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${VULTR_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${VULTR_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Vultr instance setup completed successfully!"
diff --git a/vultr/gemini.sh b/vultr/gemini.sh
index 0578d684..c81d4616 100755
--- a/vultr/gemini.sh
+++ b/vultr/gemini.sh
@@ -33,6 +33,7 @@ fi
 
 log_warn "Setting up environment variables..."
 ENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}"' EXIT
 cat > "${ENV_TEMP}" << EOF
 
 # [spawn:env]
@@ -43,7 +44,6 @@ export OPENAI_BASE_URL="https://openrouter.ai/api/v1"
 EOF
 upload_file "${VULTR_SERVER_IP}" "${ENV_TEMP}" "/tmp/env_config"
 run_server "${VULTR_SERVER_IP}" "cat /tmp/env_config >> ~/.zshrc && rm /tmp/env_config"
-rm "${ENV_TEMP}"
 
 echo ""
 log_info "Vultr instance setup completed successfully!"
diff --git a/vultr/nanoclaw.sh b/vultr/nanoclaw.sh
index d4b7ccd5..b6843dab 100755
--- a/vultr/nanoclaw.sh
+++ b/vultr/nanoclaw.sh
@@ -41,12 +41,12 @@ inject_env_vars_ssh "${VULTR_SERVER_IP}" upload_file run_server \
 
 log_warn "Configuring nanoclaw..."
 DOTENV_TEMP=$(mktemp)
+trap 'rm -f "${ENV_TEMP}" "${DOTENV_TEMP}"' EXIT
 chmod 600 "${DOTENV_TEMP}"
 cat > "${DOTENV_TEMP}" << EOF
 ANTHROPIC_API_KEY=${OPENROUTER_API_KEY}
 EOF
 upload_file "${VULTR_SERVER_IP}" "${DOTENV_TEMP}" "/root/nanoclaw/.env"
-rm "${DOTENV_TEMP}"
 
 echo ""
 log_info "Vultr instance setup completed successfully!"