diff --git a/images/Dockerfile b/images/Dockerfile
index a7ef605..fb1828f 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -220,6 +220,8 @@ RUN if [ "$EXTRA_ENTIRE" = "1" ]; then \
     fi
 
 # Install Claude
+# Cache-bust: pass --build-arg CLAUDE_CACHEBUST=$(date +%s) to force a fresh install
+ARG CLAUDE_CACHEBUST=
 RUN npm install -g @anthropic-ai/claude-code@${CLAUDE_CODE_VERSION}
 
 # Use tini as init process to properly reap zombie processes
diff --git a/setup-yolo.sh b/setup-yolo.sh
index 9559fc7..93e3afa 100755
--- a/setup-yolo.sh
+++ b/setup-yolo.sh
@@ -155,7 +155,7 @@ elif [ "$BUILD_MODE" = "yes" ] || [ "$IMAGE_EXISTS" = false ]; then
     echo
 
     TZ=$(timedatectl show --property=Timezone --value 2>/dev/null || echo "UTC")
-    BUILD_ARGS=(--build-arg "TZ=$TZ")
+    BUILD_ARGS=(--build-arg "TZ=$TZ" --build-arg "CLAUDE_CACHEBUST=$(date +%s)")
     if [ -n "$EXTRA_PACKAGES" ]; then
         BUILD_ARGS+=(--build-arg "EXTRA_PACKAGES=$EXTRA_PACKAGES")
     fi