diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml
index 61fb67ee2..0f107e7f6 100644
--- a/.github/workflows/pr_test_build_android.yml
+++ b/.github/workflows/pr_test_build_android.yml
@@ -9,7 +9,7 @@ jobs:
   PR_test_build:
     runs-on: linux-amd64
     container:
-      image: ghcr.io/cake-tech/cake_wallet:main-linux
+      image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
       env:
         STORE_PASS: test@cake_wallet
         KEY_PASS: test@cake_wallet
@@ -307,4 +307,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/build/app/outputs/flutter-apk
-          name: "android apk"
\ No newline at end of file
+          name: "android apk"
diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml
index 53904149f..d729972c7 100644
--- a/.github/workflows/pr_test_build_linux.yml
+++ b/.github/workflows/pr_test_build_linux.yml
@@ -9,7 +9,7 @@ jobs:
   PR_test_build:
     runs-on: linux-amd64
     container:
-      image: ghcr.io/cake-tech/cake_wallet:main-linux
+      image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
       env:
         STORE_PASS: test@cake_wallet
         KEY_PASS: test@cake_wallet
diff --git a/Dockerfile b/Dockerfile
index dae174a61..21f1ee6f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Usage:
-# docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:main-linux
-# docker push ghcr.io/cake-tech/cake_wallet:main-linux
+# docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:3.24.4-linux
+# docker push ghcr.io/cake-tech/cake_wallet:3.24.4-linux
 
 # Heavily inspired by cirrusci images
 # https://github.com/cirruslabs/docker-images-android/blob/master/sdk/tools/Dockerfile
@@ -23,7 +23,7 @@ ENV FLUTTER_VERSION=3.24.4
 # Comes from https://developer.android.com/studio/#command-tools
 ENV ANDROID_SDK_TOOLS_VERSION=11076708
 # Comes from https://developer.android.com/studio/releases/build-tools
-ENV ANDROID_PLATFORM_VERSION=34
+ENV ANDROID_PLATFORM_VERSION=35
 ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0
 
 # If we ever need to migrate the home directory...
@@ -106,6 +106,8 @@ RUN yes | sdkmanager \
     "platforms;android-$ANDROID_PLATFORM_VERSION" \
     "build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
     "platforms;android-33" \
+    "platforms;android-34" \
+    "platforms;android-35" \
     "build-tools;33.0.2" \
     "build-tools;33.0.1" \
     "build-tools;33.0.0" \
@@ -118,10 +120,11 @@ RUN yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
 
 # Install dependencies for tests
 # Comes from https://github.com/ReactiveCircus/android-emulator-runner
-RUN yes | sdkmanager "system-images;android-29;default;x86" \
+RUN yes | sdkmanager \
     "system-images;android-29;default;x86_64" \
     "system-images;android-31;default;x86_64" \
-    "platforms;android-29"
+    "platforms;android-29" \
+    "platforms;android-31"
 
 # Fake the KVM status so the Android emulator doesn't complain (that much)
 RUN (addgroup kvm || true) && \