diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d79df23e2..ed037b2029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -298,10 +298,7 @@ fdroid build:
 
     - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
 
-    # TODO remove sdkmanager install once it is included in the buildserver image
-    - git clone --depth=1 --branch=0.6.1 https://gitlab.com/fdroid/sdkmanager.git
-    - git -C sdkmanager checkout -B master f7e1064a78462a74cfc4ce3b1214c29644e438d7
-    - pip3 install -e sdkmanager
+    - apt-get install -y sdkmanager/bullseye-backports
     - 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"