diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 5e891e3cbcd6..6d0638463465 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -281,6 +281,11 @@ jobs:
         with:
           submodules: true
 
+      - name: Checkout wireguard-go-rs recursively
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --recursive --depth=1 wireguard-go-rs    
+
       - uses: actions/download-artifact@v4
         with:
           name: debug-keystore
@@ -387,6 +392,11 @@ jobs:
         with:
           submodules: true
 
+      - name: Checkout wireguard-go-rs recursively
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --recursive --depth=1 wireguard-go-rs
+
       - uses: actions/download-artifact@v4
         with:
           name: debug-keystore
diff --git a/building/android-container-image.txt b/building/android-container-image.txt
index 0f1f220ce4aa..b8e53a9d8681 100644
--- a/building/android-container-image.txt
+++ b/building/android-container-image.txt
@@ -1 +1 @@
-ghcr.io/mullvad/mullvadvpn-app-build-android:7b6bc0f44
+mullvadvpn-app-build:latest
diff --git a/building/container-run.sh b/building/container-run.sh
index 639c71133286..deb5e66a19d8 100755
--- a/building/container-run.sh
+++ b/building/container-run.sh
@@ -15,7 +15,7 @@ CARGO_TARGET_VOLUME_NAME=${CARGO_TARGET_VOLUME_NAME:-"cargo-target"}
 CARGO_REGISTRY_VOLUME_NAME=${CARGO_REGISTRY_VOLUME_NAME:-"cargo-registry"}
 GRADLE_CACHE_VOLUME_NAME=${GRADLE_CACHE_VOLUME_NAME:-"gradle-cache"}
 ANDROID_CREDENTIALS_DIR=${ANDROID_CREDENTIALS_DIR:-""}
-CONTAINER_RUNNER=${CONTAINER_RUNNER:-"podman"}
+CONTAINER_RUNNER=${CONTAINER_RUNNER:-"docker"}
 # Temporarily do not use mold for linking by default due to it causing build errors.
 # There's a separate issue (DES-1177) to address this problem.
 # Build servers also opt out of this and instead use GNU ld.
@@ -34,10 +34,10 @@ case ${1-:""} in
     ;;
     android)
         container_image_name=$(cat "$SCRIPT_DIR/android-container-image.txt")
-        optional_gradle_cache_volume=(-v "$GRADLE_CACHE_VOLUME_NAME:/root/.gradle:Z")
+        optional_gradle_cache_volume=(-v "$GRADLE_CACHE_VOLUME_NAME:/root/.gradle")
 
         if [ -n "$ANDROID_CREDENTIALS_DIR" ]; then
-            optional_android_credentials_volume=(-v "$ANDROID_CREDENTIALS_DIR:$REPO_MOUNT_TARGET/android/credentials:Z")
+            optional_android_credentials_volume=(-v "$ANDROID_CREDENTIALS_DIR:$REPO_MOUNT_TARGET/android/credentials")
         fi
 
         shift 1
@@ -54,9 +54,8 @@ fi
 
 set -x
 exec "$CONTAINER_RUNNER" run --rm -it \
-    -v "$REPO_DIR:$REPO_MOUNT_TARGET:Z" \
-    -v "$CARGO_TARGET_VOLUME_NAME:/cargo-target:Z" \
-    -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z" \
+    -v "$REPO_DIR:$REPO_MOUNT_TARGET" \
+    -v "$CARGO_TARGET_VOLUME_NAME:/cargo-target" \
+    -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry" \
     "${optional_gradle_cache_volume[@]}" \
-    "${optional_android_credentials_volume[@]}" \
     "$container_image_name" bash -c "$optional_mold $*"