diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f41bf77838..6a4c2cebe0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -282,15 +282,16 @@ fdroid build:
 
     - *install_fdroid_server
 
-    - for d in logs tmp unsigned $home_vagrant/build $home_vagrant/.android; do
-          test -d $d || mkdir $d;
-          chown -R vagrant $d;
-      done
     - ln -s $home_vagrant/build $CI_PROJECT_DIR/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
+          test -d $d || mkdir $d;
+          chown -R vagrant $d;
+      done
+
     - export GRADLE_USER_HOME=$home_vagrant/.gradle
     # each `fdroid build --on-server` run expects sudo, then uninstalls it
     - export fdroid="sudo --preserve-env --user vagrant