diff --git a/.github/versions.env b/.github/versions.env
index e166fc2..8447c76 100755
--- a/.github/versions.env
+++ b/.github/versions.env
@@ -1,3 +1,3 @@
-IMAGE_VERSION=1.21.8
+IMAGE_VERSION=1.21.9
 NDK_VERSION=27.2.12479018
 BAZELISK_VERSION=v1.26.0
diff --git a/android_dev/Dockerfile b/android_dev/Dockerfile
index 475fd13..a8a84fc 100644
--- a/android_dev/Dockerfile
+++ b/android_dev/Dockerfile
@@ -10,7 +10,7 @@ LABEL version="${IMAGE_VERSION}-${GEMINI_CLI_VERSION}"
 LABEL maintainer="menny@evendanan.net"
 
 # Install nodejs and pnpm. Taken from https://nodejs.org/en/download/current
-ENV NVM_DIR /opt/nvm
+ENV NVM_DIR=/opt/nvm
 RUN mkdir -p ${NVM_DIR}
 # Download and install nvm
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
diff --git a/android_dev/docker-compose.yml b/android_dev/docker-compose.yml
new file mode 100644
index 0000000..35df2f5
--- /dev/null
+++ b/android_dev/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '3.8'
+services:
+  android-dev-box:
+    image: menny/android_dev:latest
+    restart: 'no'
+    tty: true
+    stdin_open: true
+    environment:
+      - GIT_REPO=AnySoftKeyboard/AnySoftKeyboard
+      - GIT_BRANCH=main
+      - GIT_PROVIDER=github.com
+      - ACTUAL_USER=menny
+      - ACTUAL_PASSWORD=blahblah
+    volumes:
+      - /home/menny/.ssh:/root/.ssh:ro
+      - /home/menny/.ssh:/home/menny/.ssh_original:ro
+      - /home/menny/.gnupg:/home/menny/.gnupg_original:ro
+      - /home/menny/.gitconfig:/home/menny/.gitconfig_original:ro
+      - /home/menny/.gemini:/home/menny/.gemini_original:ro
+      - /home/menny/.filebrowser/srv/dev_box:/home/menny/shared_srv
+      - /etc/ssh/ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key:ro
+      - /etc/ssh/ssh_host_rsa_key.pub:/etc/ssh/ssh_host_rsa_key.pub:ro
+      - /etc/ssh/ssh_host_ecdsa_key:/etc/ssh/ssh_host_ecdsa_key:ro
+      - /etc/ssh/ssh_host_ecdsa_key.pub:/etc/ssh/ssh_host_ecdsa_key.pub:ro
+      - /etc/ssh/ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key:ro
+      - /etc/ssh/ssh_host_ed25519_key.pub:/etc/ssh/ssh_host_ed25519_key.pub:ro
+    ports:
+      - 2201:22
diff --git a/local_build.sh b/local_build.sh
index 15ec2fe..e851e4c 100755
--- a/local_build.sh
+++ b/local_build.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-
 set -e
 
 # Source the versions.env file to get default values
 source .github/versions.env
+echo "Will use args: IMAGE_VERSION=${IMAGE_VERSION}, NDK_VERSION=${NDK_VERSION}, BAZELISK_VERSION=${BAZELISK_VERSION}"
 
 function build_image() {
     local image_name="$1"