diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 1b58922..a2cec86 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/android/Dockerfile b/android/Dockerfile
index 706a7e1..6f6cf73 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -5,14 +5,14 @@ LABEL maintainer="info@famedly.com"
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-ENV ANDROID_SDK_TOOLS=9123335 GLIBC_VERSION=2.34-r0 ANDROID_HOME=/opt/android/sdk ANDROID_SDK_ROOT=/opt/android/sdk ADB_INSTALL_TIMEOUT=120 JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+ENV ANDROID_SDK_TOOLS=10406996_latest GLIBC_VERSION=2.34-r0 ANDROID_HOME=/opt/android/sdk ANDROID_SDK_ROOT=/opt/android/sdk ADB_INSTALL_TIMEOUT=120 JAVA_HOME=/usr/lib/jvm/java-17-openjdk
 ENV PATH=${ANDROID_SDK_ROOT}/emulator:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH}
 
 # Add pubkey for glibc package
 COPY sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
 
 # Install java and ruby and glibc dependencies for android and (later) flutter
-RUN apk add --no-cache curl openjdk11 ruby-full ruby-dev ruby-rdoc make g++ bash curl unzip git gzip tar xz jq openssh-client tzdata python3 \
+RUN apk add --no-cache curl openjdk17 ruby-full ruby-dev ruby-rdoc make g++ bash curl unzip git gzip tar xz jq openssh-client tzdata python3 \
  && apk add lcov --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
  && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \
  && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk \
@@ -26,7 +26,7 @@ RUN curl -o /bin/lcov_cobertura.py https://raw.githubusercontent.com/eriwen/lcov
 
 # Download and install Android SDK
 RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools && \
-    curl https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip | busybox unzip -d ${ANDROID_SDK_ROOT}_temp - && mv ${ANDROID_SDK_ROOT}_temp/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest && rm -R ${ANDROID_SDK_ROOT}_temp && chmod +x ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/*
+    curl https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}.zip | busybox unzip -d ${ANDROID_SDK_ROOT}_temp - && mv ${ANDROID_SDK_ROOT}_temp/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest && rm -R ${ANDROID_SDK_ROOT}_temp && chmod +x ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/*
 
 RUN yes | sdkmanager --licenses
 
@@ -40,11 +40,6 @@ RUN sdkmanager \
   "build-tools;30.0.3" \
   "cmake;3.18.1" \
   "cmake;3.22.1" \
-  "platforms;android-33" \
-  "platforms;android-32" \
   "platforms;android-31" \
-  "platforms;android-30" \
-  "platforms;android-29" \
-  "platforms;android-28" \
-  "ndk;21.4.7075529" \
+  "ndk;25.1.8937393" \
  && sdkmanager --uninstall "emulator"
diff --git a/integration/Dockerfile b/integration/Dockerfile
index 5d1a35d..6004273 100644
--- a/integration/Dockerfile
+++ b/integration/Dockerfile
@@ -3,6 +3,6 @@ FROM ${flutter_image}
 
 LABEL maintainer="info@famedly.com"
 
-RUN sdkmanager 'emulator' 'system-images;android-30;google_apis;x86_64' && rm -rf /opt/android/sdk/emulator-2
-RUN avdmanager create avd --force --package 'system-images;android-30;google_apis;x86_64' --device pixel_4_xl --name test
+RUN sdkmanager 'emulator' 'system-images;android-31;google_apis;x86_64' && rm -rf /opt/android/sdk/emulator-2
+RUN avdmanager create avd --force --package 'system-images;android-31;google_apis;x86_64' --device pixel_4_xl --name test
 RUN apk add --no-cache mesa-gl nodejs npm docker drill grep py3-pip scrcpy ffmpeg openssl sqlite