diff --git a/Dockerfile.builder b/Dockerfile.builder
index 0c812bed4bad2ea81f245668a4b4514c3e250be5..7aae1c8ca1ddf18856d074ed9967cb9749f02fb5 100755
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,7 +1,7 @@
 # docker build --target=haf-builder -t ${REGISTRY}hive-builder:ubuntu22.04-11 -f Dockerfile.builder .
 
 ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/
-ARG CI_IMAGE_TAG=:ubuntu24.04-1
+ARG CI_IMAGE_TAG=:ubuntu24.04-6
 
 FROM ${CI_REGISTRY_IMAGE}ci-base-image$CI_IMAGE_TAG AS haf-builder
 
@@ -15,7 +15,10 @@ ENV DEFAULT_USER_UID=${DEFAULT_USER_UID}
 ENV DEFAULT_USER_GID=${DEFAULT_USER_GID}
 ENV DOCKER_GROUP=${DOCKER_GROUP}
 ENV DISPLAY=host.docker.internal:0.0
-ENV DEBIAN_FRONTEND=noniteractive
+ENV DEBIAN_FRONTEND=noninteractive
+
+ENV ANTHROPIC_BASE_URL="http://claude.ccflare"
+ENV CLAUDE_CODE_OAUTH_TOKEN=haf-builder
 
 USER root
 
@@ -40,7 +43,9 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
   && ln -s /usr/bin/sudo /usr/bin/pkexec \
   && rm -f /etc/service/sshd/down \
   && rm -rf /var/lib/apt/lists/* \
-  && /etc/my_init.d/00_regen_ssh_host_keys.sh
+  && /etc/my_init.d/00_regen_ssh_host_keys.sh \
+  && mkdir -vp /home/${DEFAULT_USER}/.ssh && chown ${DEFAULT_USER}:users /home/${DEFAULT_USER}/.ssh && chmod 755 /home/${DEFAULT_USER}/.ssh \
+  && mkdir -vp /home/hived/.ssh && chown hived:users /home/hived/.ssh && chmod 755 /home/hived/.ssh
 
 COPY sshd_config /etc/ssh/sshd_config
 
@@ -52,6 +57,9 @@ ADD --chown=${DEFAULT_USER} --chmod=644 .gitconfig /home/${DEFAULT_USER}/
 ADD --chown=${DEFAULT_USER} --chmod=644 authorized_keys /home/${DEFAULT_USER}/.ssh/authorized_keys
 ADD --chown=hived --chmod=644 authorized_keys /home/hived/.ssh/authorized_keys
 
+RUN curl -fsSL https://claude.ai/install.sh | bash \
+  && echo '{"hasCompletedOnboarding": true}' > /home/${DEFAULT_USER}/.claude.json
+
 VOLUME /workspace
 
 EXPOSE 22
@@ -77,3 +85,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
   cd "/home/${DEFAULT_USER}" && curl -o klogg_x64.deb -L https://github.com/variar/klogg/releases/download/v22.06/klogg-22.06.0.1289-Linux-amd64-jammy.deb && DEBIAN_FRONTEND=noniteractive apt install -y ./klogg_x64.deb
 
 USER ${DEFAULT_USER}
+
+ENV ANTHROPIC_BASE_URL="http://claude.ccflare"
+ENV CLAUDE_CODE_OAUTH_TOKEN=haf-builder
+
diff --git a/build_image.sh b/build_image.sh
index f415a5de70181b6d3291bf4401b265c20d06cd00..512cf3713fd72bd70743a1e91b8ec082ad73bee8 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -9,7 +9,7 @@ HOST_USER=$(whoami)
 DOCKER_GROUP=$(getent group docker | cut -d: -f3)
 
 
-CI_IMAGE_TAG=:ubuntu24.04-1
+CI_IMAGE_TAG=:ubuntu24.04-6
 
 export DOCKER_BUILDKIT=1
 
diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh
index 76e7905a50f11acaf0e4c9a10be6b6e0e337603f..a6d26f9b0be6273c3aecd9cfdab688ca4fb6f79c 100755
--- a/docker_entrypoint.sh
+++ b/docker_entrypoint.sh
@@ -13,5 +13,8 @@ if [ ! -L "$SYM_LINK" ]; then
   ln -s ${DATADIR} ${SYM_LINK}
 fi
 
+# In entrypoint, before starting services
+export -p | sudo -n tee /etc/profile.d/docker-env.sh > /dev/null
+
 /usr/bin/sudo -n -E /usr/sbin/service docker start
 /usr/bin/sudo -n -E /usr/sbin/sshd -D -e