diff --git a/docker/Dockerfile.python39.platform-28 b/docker/Dockerfile.python39.platform-28
index 6b1c5ec..6607f07 100644
--- a/docker/Dockerfile.python39.platform-28
+++ b/docker/Dockerfile.python39.platform-28
@@ -14,9 +14,6 @@ RUN rm -f /usr/bin/python && ln -s /usr/bin/python3.9 /usr/bin/python
 RUN wget https://bootstrap.pypa.io/pip/get-pip.py && python3 get-pip.py
 RUN pip install --upgrade cython==0.29.24 setuptools zipp importlib-resources importlib-metadata virtualenv appdirs sh colorama\>=0.3.3 jinja2 six pep517\<0.7.0 toml
 
-RUN git clone https://github.com/lbryio/buildozer.git
-RUN cd buildozer && python setup.py install && cd ..
-
 RUN mkdir -p cd ~/.buildozer/android/platform/
 
 RUN wget 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ && \
@@ -31,9 +28,10 @@ RUN tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.build
     mkdir -p ~/.buildozer/android/platform/android-sdk/build-tools && \
     unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk/build-tools && \
     mv ~/.buildozer/android/platform/android-sdk/build-tools/android-9 ~/.buildozer/android/platform/android-sdk/build-tools/28.0.3 && \
-    unzip ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip -d ~/.buildozer/android/platform/android-sdk && \
-    cp -Rf ~/.buildozer/android/platform/android-sdk/cmdline-tools/* ~/.buildozer/android/platform/android-sdk/tools && \
-    rm -rf ~/.buildozer/android/platform/android-sdk/cmdline-tools
+    mkdir -p ~/.buildozer/android/platform/android-sdk/cmdline-tools && \
+    unzip ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip -d ~/.buildozer/android/platform/android-sdk/cmdline-tools && \
+    mv ~/.buildozer/android/platform/android-sdk/cmdline-tools/cmdline-tools ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0 && \
+    cp -Rf ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0/* ~/.buildozer/android/platform/android-sdk/tools
 
 RUN rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \
     rm ~/.buildozer/android/platform/platform-28_r06.zip && \
@@ -43,4 +41,7 @@ RUN rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \
 RUN mkdir -p ~/.buildozer/android/platform/android-sdk/licenses && \
     echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk/licenses/android-sdk-license
 
+RUN git clone https://github.com/lbryio/buildozer.git
+RUN cd buildozer && python setup.py install && cd ..
+
 CMD ["/bin/bash"]