diff --git a/.github/versions.env b/.github/versions.env
index 6255303..f40bb43 100755
--- a/.github/versions.env
+++ b/.github/versions.env
@@ -1,3 +1,3 @@
-IMAGE_VERSION=1.21.5
+IMAGE_VERSION=1.21.6
 NDK_VERSION=27.2.12479018
 BAZELISK_VERSION=v1.26.0
diff --git a/android_dev/Dockerfile b/android_dev/Dockerfile
index dd66f8e..475fd13 100644
--- a/android_dev/Dockerfile
+++ b/android_dev/Dockerfile
@@ -41,7 +41,7 @@ RUN . "$NVM_DIR/nvm.sh" && pnpm add -g @google/gemini-cli@${GEMINI_CLI_VERSION}
 # Install dependencies
 RUN apt update \
     && apt install -y --allow-remove-essential --allow-change-held-packages \
-    zsh openssh-server \
+    zsh openssh-server tmux \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -67,7 +67,8 @@ RUN RUNZSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmy
 RUN echo "export NVM_DIR=${NVM_DIR}" >> /home/${ACTUAL_USER}/.zshrc && \
     echo "export PNPM_HOME=${PNPM_HOME}" >> /home/${ACTUAL_USER}/.zshrc && \
     echo "export PATH=${PATH}" >> /home/${ACTUAL_USER}/.zshrc && \
-    echo "source ${NVM_DIR}/nvm.sh" >> /home/${ACTUAL_USER}/.zshrc
+    echo "source ${NVM_DIR}/nvm.sh" >> /home/${ACTUAL_USER}/.zshrc && \
+    echo "tmux attach-session -t dev-session 2>/dev/null || tmux new-session -s dev-session" >> /home/${ACTUAL_USER}/.zshrc
 
 # Switch back to root for remaining setup
 USER root