diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5797fd7d29b57b29acb6b642a14dbfbe81636ca..8987534dbdbc09df8fcb8fb0b2f3356ac87a2648 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,13 @@ create-binaries:
   script:
   - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
   - .orchestra/ci/install-dependencies.sh
-  - git remote add internal https://gitlab-ci-token:${CI_JOB_TOKEN}@rev.ng/gitlab/revng-internal/orchestra-v3.git || true
-  - git remote add private https://gitlab-ci-token:${CI_JOB_TOKEN}@rev.ng/gitlab/revng-private/orchestra-v3.git || true
+  - |
+    git remote add internal https://gitlab-ci-token:${CI_JOB_TOKEN}@rev.ng/gitlab/revng-internal/orchestra-v3.git || \
+      git remote set-url internal https://gitlab-ci-token:${CI_JOB_TOKEN}@rev.ng/gitlab/revng-internal/orchestra-v3.git || \
+      true
+  - |
+    git remote add private https://gitlab-ci-token:${CI_JOB_TOKEN}@rev.ng/gitlab/revng-private/orchestra-v3.git || \
+      git remote set-url private https://gitlab-ci-token:${CI_JOB_TOKEN}@rev.ng/gitlab/revng-private/orchestra-v3.git || \
+      true
   - ./orchestra.py components
   - ./orchestra.py -b install --create-binary-archives ui/cold-revng