diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 462c524294..d6da51a2dc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -102,7 +102,7 @@ jobs:
       contents: read
       packages: read
     container:
-      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
+      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
       credentials:
         username: ${{ github.actor }}
         password: ${{ github.token }}
@@ -743,7 +743,7 @@ jobs:
       contents: read
       packages: read
     container:
-      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
+      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
       credentials:
         username: ${{ github.actor }}
         password: ${{ github.token }}
@@ -1201,7 +1201,7 @@ jobs:
       contents: read
       packages: read
     container:
-      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
+      image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:android
       credentials:
         username: ${{ github.actor }}
         password: ${{ github.token }}
diff --git a/Dockerfile b/Dockerfile
index 265b9d86a1..42ac5c65b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,8 +63,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "platforms;android-32" \
+      "platforms;android-33" \
+      "platforms;android-34" \
       "platforms;android-35" \
+      "platforms;android-36" \
+      "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
+      "cmake;3.22.1" \
  && chmod -R a+rwX "$ANDROID_SDK_ROOT"
 
 ENV PATH=/usr/local/go/bin:$PATH
@@ -142,8 +148,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "platforms;android-32" \
+      "platforms;android-33" \
+      "platforms;android-34" \
       "platforms;android-35" \
+      "platforms;android-36" \
+      "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
+      "cmake;3.22.1" \
  && chmod -R a+rwX "$ANDROID_SDK_ROOT"
 
 ENV PATH=/usr/local/go/bin:$PATH