diff --git a/AndroidSDK/Dockerfile b/AndroidSDK/Dockerfile
index 6232493..f76ff03 100644
--- a/AndroidSDK/Dockerfile
+++ b/AndroidSDK/Dockerfile
@@ -1,3 +1,15 @@
+FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild AS ADK
+
+ENV ANDROID_HOME "/opt/android-sdk-linux"
+ENV ANDROID_SDK_VER 11076708
+ENV ANDROID_SDK_ROOT $ANDROID_HOME
+
+RUN curl -sO https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip
+
+RUN unzip -qq /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip -d $ANDROID_SDK_ROOT
+RUN rm -v /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip
+ADD packages.txt /
+
 FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
 
 ENV ANDROID_HOME "/opt/android-sdk-linux"
@@ -7,6 +19,8 @@ ENV ANDROID_SDK_ROOT $ANDROID_HOME
 
 ENV PATH $PATH:$ANDROID_HOME/cmdline-tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools
 
+COPY --from=ADK ${ANDROID_HOME} ${ANDROID_HOME}
+
 RUN mkdir -p $ANDROID_HOME/licenses
 RUN yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --licenses --sdk_root=${ANDROID_SDK_ROOT}
 
@@ -18,7 +32,7 @@ WORKDIR /root
 
 RUN curl -s "https://get.sdkman.io" | bash
 
-ADD ./packages.txt $HOME/packages.txt
+COPY --from=ADK /packages.txt $HOME/packages.txt
 
 # Use SDK Manager to install necessary components
 RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update \