diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7d84686b5..b403ffd823 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ lint:
     - rm -rf fdroidserver
     - mkdir fdroidserver
     - git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
-    - curl --silent https://gitlab.com/fdroid/fdroidserver/repository/master/archive.tar.gz
+    - curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz
         | tar -xz --directory=fdroidserver --strip-components=1
     - export PATH="$PWD/fdroidserver:$PATH"
     - touch config.py
@@ -126,7 +126,7 @@ checkupdates_runner:
     - rm -rf fdroidserver
     - mkdir fdroidserver
     - git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
-    - curl --silent https://gitlab.com/fdroid/fdroidserver/repository/master/archive.tar.gz
+    - curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz
         | tar -xz --directory=fdroidserver --strip-components=1
     - export PATH="$PWD/fdroidserver:$PATH"
     - touch config.py
@@ -179,7 +179,7 @@ fdroid build:
 
     - test -d fdroidserver || mkdir fdroidserver
     - git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
-    - curl --silent https://gitlab.com/fdroid/fdroidserver/repository/master/archive.tar.gz
+    - curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz
           | tar -xz --directory=fdroidserver --strip-components=1
     - export PATH="`pwd`/fdroidserver:$PATH"
     - export PYTHONPATH="$CI_PROJECT_DIR/fdroidserver:$CI_PROJECT_DIR/fdroidserver/examples"
@@ -259,7 +259,7 @@ pages:
     - apt-get purge fdroidserver
     - test -d fdroidserver || mkdir fdroidserver
     - git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
-    - curl --silent https://gitlab.com/fdroid/fdroidserver/repository/master/archive.tar.gz
+    - curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz
         | tar -xz --directory=$CI_PROJECT_DIR/fdroidserver --strip-components=1
     - export PATH="$CI_PROJECT_DIR/fdroidserver:$PATH"
     - export PYTHONPATH="$CI_PROJECT_DIR/fdroidserver:$CI_PROJECT_DIR/fdroidserver/examples"
@@ -269,11 +269,11 @@ pages:
     - rm -rf $GRADLE_USER_HOME/fdroid
     - mkdir -p $GRADLE_USER_HOME/fdroid
     - git ls-remote https://gitlab.com/fdroid/gradle-plugins.git master
-    - curl --silent https://gitlab.com/fdroid/gradle-plugins/repository/master/archive.tar.gz
+    - curl --silent https://gitlab.com/fdroid/gradle-plugins/-/archive/master/gradle-plugins-master.tar.gz
         | tar -xz --directory=$GRADLE_USER_HOME/fdroid --strip-components=1
 
     - git ls-remote https://gitlab.com/fdroid/issuebot.git master
-    - curl --silent https://gitlab.com/fdroid/issuebot/repository/master/archive.tar.gz
+    - curl --silent https://gitlab.com/fdroid/issuebot/-/archive/master/issuebot-master.tar.gz
         | tar -xz --strip-components=1
     - pyvenv --system-site-packages --clear issuebot-env
     - . issuebot-env/bin/activate