diff --git a/cleveractors-core-oneshot.bash b/cleveractors-core-oneshot.bash
index 895ba7f..d5c6034 100755
--- a/cleveractors-core-oneshot.bash
+++ b/cleveractors-core-oneshot.bash
@@ -14,8 +14,6 @@ git clone \
   https://$FORGEJO_PAT@git.cleverthis.com/cleveragents/cleveractors-core.git \
   $WORKDIR
 
-cd $WORKDIR
-
 docker run -it --rm \
   --network=host \
   --name "cleveractors-core_dev_${RAND_NAME}" \
@@ -26,13 +24,7 @@ docker run -it --rm \
   --volume "/home/skyblond/opencode/opencode.json:/home/devuser/.config/opencode/opencode.json:ro" \
   --volume "/home/skyblond/opencode/scripts:/external/opencode/scripts:ro" \
   --volume "/home/skyblond/opencode/opencode-data:/home/devuser/.local/share/opencode/" \
-  --env "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
-  --env "OPENAI_API_KEY=${OPENAI_API_KEY}" \
-  --env "ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}" \
-  --env "GOOGLE_API_KEY=${GOOGLE_API_KEY}" \
-  --env "GEMINI_API_KEY=${GEMINI_API_KEY}" \
-  --env "HF_TOKEN=${HF_TOKEN}" \
-  --env "FORGEJO_PAT=${FORGEJO_PAT}" \
+  --env-file .env \
   cleverrouter-dev zsh -c "/home/devuser/.opencode/bin/opencode upgrade ; /home/devuser/.opencode/bin/opencode"
 
 # anthropic/claude-opus-4.6
diff --git a/cleverrouter-oneshot.bash b/cleverrouter-oneshot.bash
index 3aefe49..24be693 100755
--- a/cleverrouter-oneshot.bash
+++ b/cleverrouter-oneshot.bash
@@ -17,8 +17,6 @@ git clone \
 git -C $WORKDIR checkout develop
 
 
-cd $WORKDIR
-
 docker run -it --rm \
   --network=host \
   --name "cleverrouter_dev_${RAND_NAME}" \
@@ -29,13 +27,7 @@ docker run -it --rm \
   --volume "/home/skyblond/opencode/opencode.json:/home/devuser/.config/opencode/opencode.json:ro" \
   --volume "/home/skyblond/opencode/scripts:/external/opencode/scripts:ro" \
   --volume "/home/skyblond/opencode/opencode-data:/home/devuser/.local/share/opencode/" \
-  --env "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
-  --env "OPENAI_API_KEY=${OPENAI_API_KEY}" \
-  --env "ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}" \
-  --env "GOOGLE_API_KEY=${GOOGLE_API_KEY}" \
-  --env "GEMINI_API_KEY=${GEMINI_API_KEY}" \
-  --env "HF_TOKEN=${HF_TOKEN}" \
-  --env "FORGEJO_PAT=${FORGEJO_PAT}" \
+  --env-file .env \
   cleverrouter-dev zsh -c "/home/devuser/.opencode/bin/opencode upgrade ; /home/devuser/.opencode/bin/opencode"
 
 # anthropic/claude-opus-4.6
diff --git a/start-dev-container-joint.bash b/start-dev-container-joint.bash
index 1683719..8a67f81 100755
--- a/start-dev-container-joint.bash
+++ b/start-dev-container-joint.bash
@@ -2,8 +2,6 @@
 
 set -e
 
-[ ! -f .env ] || export $(grep -v '^#' .env | xargs)
-
 WORKDIR=~/git/git.cleverthis.com/cleveragents
 CONTAINER_NAME=cleverthis-dev-joint
 
@@ -24,13 +22,7 @@ docker run -it --rm \
   --volume "/home/skyblond/opencode/opencode-data:/home/devuser/.local/share/opencode/" \
   --volume "/home/skyblond/opencode/scripts:/external/opencode/scripts" \
   --volume "/var/run/docker.sock:/var/run/docker.sock" \
-  --env "OPENROUTER_API_KEY=${OPENROUTER_API_KEY}" \
-  --env "OPENAI_API_KEY=${OPENAI_API_KEY}" \
-  --env "ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}" \
-  --env "GOOGLE_API_KEY=${GOOGLE_API_KEY}" \
-  --env "GEMINI_API_KEY=${GEMINI_API_KEY}" \
-  --env "HF_TOKEN=${HF_TOKEN}" \
-  --env "FORGEJO_PAT=${FORGEJO_PAT}" \
+  --env-file .env \
   cleverrouter-dev zsh -c "/home/devuser/.opencode/bin/opencode"
 
 # anthropic/claude-opus-4.6