diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 355ecf09ce..f79b8b40b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,14 +300,10 @@ fdroid build:
 
     - apt-get update
     - apt-get dist-upgrade
-    - apt-get clean
 
     - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
 
     - *install_sdkmanager
-
-    - sdkmanager "tools" "platform-tools" "build-tools;31.0.0"
-
     - *install_fdroid_server
 
     - ln -s $home_vagrant/build $CI_PROJECT_DIR/build
@@ -315,7 +311,7 @@ fdroid build:
     # make sure .gradle stores inside $CI_PROJECT_DIR to make it cacheable
     - ln -s $home_vagrant/.gradle $CI_PROJECT_DIR/.gradle
 
-    - for d in logs tmp unsigned $home_vagrant/build $home_vagrant/.android $home_vagrant/.gradle $ANDROID_HOME; do
+    - for d in logs tmp unsigned $home_vagrant/build $home_vagrant/.android $home_vagrant/.gradle; do
           test -d $d || mkdir $d;
           chown -R vagrant $d;
       done