diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa4be75701..c8258c42e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,7 @@ fdroid build:
     - apt-get update
     - apt-get dist-upgrade
 
-    - source /etc/profile.d/bsenv.sh
+    - 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.5.2 https://gitlab.com/fdroid/sdkmanager.git
@@ -335,6 +335,7 @@ pages:
     - apt-get update
     - apt-get dist-upgrade
 
+    - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
     - test -d $fdroidserver || mkdir $fdroidserver
     - git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
     - curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz