diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile
index 971507997b2876f8f74f209e15e2f0d3ca5ab61c..f4a91838921f76bd5c0290ccfbd5265040fcf112 100644
--- a/docker/android-emulator/Dockerfile
+++ b/docker/android-emulator/Dockerfile
@@ -32,7 +32,8 @@ RUN echo y | sdkmanager "emulator"
 
 # Install System Images for emulators
 RUN echo y | sdkmanager "system-images;android-27;google_apis;x86"
-RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64"
-RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64"
+# RUN echo y | sdkmanager "system-images;android-27;google_apis;x86"
+# RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64"
+# RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64"
 
 RUN echo no | avdmanager create avd --force --name testApi27 --abi google_apis/x86 --package 'system-images;android-27;google_apis;x86'
\ No newline at end of file
diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile
index 9a72228a0f6c65cde4acd0e001cfa0b4329cda4f..4c4cf2dd8a31319a69b956abc65054b315f06dd9 100644
--- a/docker/android-sdk/Dockerfile
+++ b/docker/android-sdk/Dockerfile
@@ -59,16 +59,18 @@ RUN echo y | sdkmanager "platform-tools" # echo y to accept google licenses
 RUN sdkmanager "extras;android;m2repository"
 
 # Install Build Tools (Please keep in descending order)
-RUN sdkmanager "build-tools;28.0.3"
-RUN sdkmanager "build-tools;27.0.3"
-RUN sdkmanager "build-tools;25.0.2"
-RUN sdkmanager "build-tools;23.0.3"
+RUN sdkmanager "build-tools;30.0.3"
+# RUN sdkmanager "build-tools;28.0.3"
+# RUN sdkmanager "build-tools;27.0.3"
+# RUN sdkmanager "build-tools;25.0.2"
+# RUN sdkmanager "build-tools;23.0.3"
 
 # Install Target SDK Packages (Please keep in descending order)
-RUN sdkmanager "platforms;android-28"
-RUN sdkmanager "platforms;android-27"
-RUN sdkmanager "platforms;android-25"
-RUN sdkmanager "platforms;android-23"
+RUN sdkmanager "platforms;android-30"
+# RUN sdkmanager "platforms;android-28"
+# RUN sdkmanager "platforms;android-27"
+# RUN sdkmanager "platforms;android-25"
+# RUN sdkmanager "platforms;android-23"
 
 RUN echo "accept all licenses"
 # Accept all licenses