diff --git a/Dockerfile b/Dockerfile
index 83ea871..1677f9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ ENV ANDROID_SDK       ${ANDROID_HOME}
 ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin"
 ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin"
 ENV PATH "${PATH}:${ANDROID_HOME}/tools/bin"
+ENV PATH "${PATH}:${ANDROID_HOME}/build-tools/30.0.2"
 ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools"
 ENV PATH "${PATH}:${ANDROID_HOME}/emulator"
 ENV PATH "${PATH}:${ANDROID_HOME}/bin"
diff --git a/tools/android-env.sh b/tools/android-env.sh
index ad48188..6518535 100644
--- a/tools/android-env.sh
+++ b/tools/android-env.sh
@@ -8,6 +8,7 @@ export ANDROID_SDK=${ANDROID_HOME}
 export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin
 export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin
 export PATH=${PATH}:${ANDROID_HOME}/tools/bin
+export PATH=${PATH}:${ANDROID_HOME}/build-tools/30.0.2
 export PATH=${PATH}:${ANDROID_HOME}/platform-tools
 export PATH=${PATH}:${ANDROID_HOME}/emulator
 export PATH=${PATH}:${ANDROID_HOME}/bin
diff --git a/tools/android-sdk-update.sh b/tools/android-sdk-update.sh
index 8481379..11f6f99 100755
--- a/tools/android-sdk-update.sh
+++ b/tools/android-sdk-update.sh
@@ -36,6 +36,7 @@ else
   unzip commandlinetools-linux.zip
   mkdir cmdline-tools
   mv tools cmdline-tools/
+  rm commandlinetools-linux.zip
 fi
 
 echo "Make sure repositories.cfg exists"