diff --git a/start-dev-container-oneshot.bash b/start-dev-container-oneshot.bash
index 9a1a346..9cee5f8 100755
--- a/start-dev-container-oneshot.bash
+++ b/start-dev-container-oneshot.bash
@@ -2,7 +2,7 @@
 
 set -e
 
-FORGEJO_PAT=c5eb2cd6e3789a0cc7294d2695195a9e3ed29a62
+[ ! -f .env ] || export $(grep -v '^#' .env | xargs)
 
 RAND_NAME=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 16; echo)
 mkdir -p /tmp/opencode
@@ -25,12 +25,12 @@ docker run -it --rm \
   --volume "/home/skyblond/opencode/agents:/home/devuser/.config/opencode/agents:ro" \
   --volume "/home/skyblond/opencode/skills:/home/devuser/.config/opencode/skills:ro" \
   --volume "/home/skyblond/opencode/scripts:/external/opencode/scripts:ro" \
-  --env "OPENROUTER_API_KEY=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" \
-  --env "OPENAI_API_KEY=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" \
-  --env "ANTHROPIC_API_KEY=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" \
-  --env "GOOGLE_API_KEY=AIzaSyAxZkKeKssz5DmI8hJ69z8OqwkaRZbix3I" \
-  --env "GEMINI_API_KEY=AIzaSyAxZkKeKssz5DmI8hJ69z8OqwkaRZbix3I" \
-  --env "HF_TOKEN=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" \
+  --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}" \
   cleveragents-dev zsh -c "/home/devuser/.opencode/bin/opencode upgrade && /home/devuser/.opencode/bin/opencode -m anthropic/claude-opus-4.6"
 
diff --git a/start-dev-container-persist.bash b/start-dev-container-persist.bash
index f00c11b..b26dc99 100755
--- a/start-dev-container-persist.bash
+++ b/start-dev-container-persist.bash
@@ -14,12 +14,16 @@ cd $WORKDIR
 git fetch origin
 git reset --hard origin/master
 
-docker run --rm \
+docker stop cleveragents_dev_persist || true
+docker rm -f cleveragents_dev_persist || true
+
+docker run -it --rm \
   --network=host \
   --cpus="12" \
   --name "cleveragents_dev_persist" \
   --user $(id -u):$(id -g) \
   --volume "${WORKDIR}:/app" \
+  --volume "/home/skyblond/cleverthis/cleveragents/workspace:/workspace" \
   --volume "/home/skyblond/opencode/agents:/home/devuser/.config/opencode/agents:ro" \
   --volume "/home/skyblond/opencode/skills:/home/devuser/.config/opencode/skills:ro" \
   --volume "/home/skyblond/opencode/scripts:/external/opencode/scripts:ro" \
@@ -30,7 +34,7 @@ docker run --rm \
   --env "GEMINI_API_KEY=${GEMINI_API_KEY}" \
   --env "HF_TOKEN=${HF_TOKEN}" \
   --env "FORGEJO_PAT=${FORGEJO_PAT}" \
-  cleveragents-dev zsh -c "/home/devuser/.opencode/bin/opencode upgrade && /home/devuser/.opencode/bin/opencode serve --hostname 0.0.0.0"
+  cleveragents-dev zsh -c "/home/devuser/.opencode/bin/opencode upgrade && /home/devuser/.opencode/bin/opencode -m anthropic/claude-opus-4.6"
 
 # anthropic/claude-opus-4.6
 # openrouter/anthropic/claude-opus-4.6
diff --git a/start-dev-container-skill.bash b/start-dev-container-skill.bash
index dc44958..ab8cbe1 100755
--- a/start-dev-container-skill.bash
+++ b/start-dev-container-skill.bash
@@ -4,12 +4,23 @@ set -e
 
 [ ! -f .env ] || export $(grep -v '^#' .env | xargs)
 
+RAND_NAME=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 16; echo)
+mkdir -p /tmp/opencode
+WORKDIR=/tmp/opencode/cleveragents-core-$RAND_NAME
+
+trap 'cd /tmp/opencode && rm -rf "$WORKDIR"' EXIT
+
+git clone \
+  https://$FORGEJO_PAT@git.cleverthis.com/cleveragents/cleveragents-core.git \
+  $WORKDIR
+
 docker run -it --rm \
   --network=host \
   --cpus="12" \
   --name "cleveragents_dev_skill" \
   --user $(id -u):$(id -g) \
   --volume "/home/skyblond/opencode:/app" \
+  --volume "${WORKDIR}:/code:ro" \
   --volume "/home/skyblond/opencode/agents:/home/devuser/.config/opencode/agents" \
   --volume "/home/skyblond/opencode/skills:/home/devuser/.config/opencode/skills" \
   --volume "/home/skyblond/opencode/scripts:/external/opencode/scripts:ro" \