diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfca9cd365..42898d9d05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -395,9 +395,8 @@ fdroid build:
 
     - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
 
-    - rm -rf $ANDROID_HOME/tools  # TODO remove once sdkmanager can upgrade installed packages
     # These packages are needed to make this env like the production buildserver.
-    - sdkmanager "tools" "platform-tools" "build-tools;31.0.0"
+    - sdkmanager "platform-tools" "build-tools;31.0.0"
 
     - *install_fdroid_server