diff --git a/.github/workflows/android-app-wrapper.yml b/.github/workflows/android-app-wrapper.yml
new file mode 100644
index 000000000000..f86179547461
--- /dev/null
+++ b/.github/workflows/android-app-wrapper.yml
@@ -0,0 +1,32 @@
+---
+name: Android - Wrapper build
+on:
+  workflow_dispatch:
+  pull_request:
+
+permissions: {}
+
+jobs:
+  build-app:
+    name: Build app (using wrapper)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        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
+
+      - name: Install podman
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install podman
+
+      - name: Run build script
+        shell: bash
+        run: ./building/containerized-build.sh android --dev-build
diff --git a/build-apk.sh b/build-apk.sh
index 190e4e1f2ab2..05b5762c5192 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -77,7 +77,7 @@ mkdir -p "app/build/extraAssets"
 mkdir -p "app/build/extraJni"
 popd
 
-for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
+for ARCHITECTURE in ${ARCHITECTURES:-x86_64}; do
     case "$ARCHITECTURE" in
         "x86_64")
             TARGET="x86_64-linux-android"
@@ -111,6 +111,8 @@ for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
     fi
 done
 
+exit 0
+
 echo "Updating relays.json..."
 cargo run --bin relay_list "${CARGO_ARGS[@]}" > android/app/build/extraAssets/relays.json
 
diff --git a/building/container-run.sh b/building/container-run.sh
index 639c71133286..a18aa0ddb9ab 100755
--- a/building/container-run.sh
+++ b/building/container-run.sh
@@ -55,8 +55,4 @@ 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" \
-    "${optional_gradle_cache_volume[@]}" \
-    "${optional_android_credentials_volume[@]}" \
     "$container_image_name" bash -c "$optional_mold $*"