diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebe82242786cbd70856fe36840d69c3bbc304bc8..57cf0814a613d4603e9026066bdb78249c53ee63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,14 +34,17 @@ setup:
   tags:
     - docker
   before_script:
+    - BASE_URL="${CI_PAGES_URL}/"
     - echo $CI_ENVIRONMENT_URL
     - echo $ROOT_RELATIVE_NAMESPACE
     - test "$ROOT_RELATIVE_NAMESPACE" == "${CI_PROJECT_NAMESPACE#$CI_PROJECT_ROOT_NAMESPACE}" || { echo "ROOT_RELATIVE_NAMESPACE is not set correctly" ; exit 1 ; }
   script:
+    - BASE_URL="${CI_ENVIRONMENT_URL:-$CI_PAGES_URL/}"
+    - BASE_URL="${BASE_URL%/index.html}
     - find src/ -type f \( -iname '*.html' -or -iname 'sitemap.xml' \)
       -exec sed -i
         -e "s|%%BRANCH%%|${CI_COMMIT_BRANCH}|g"
-        -e "s|%%BASE_URL%%|${CI_PAGES_URL}/|g"
+        -e "s|%%BASE_URL%%|${BASE_URL}|g"
         -e "s|%%COMMIT_SHA%%|${CI_COMMIT_SHORT_SHA}|g"
         -e "s|%%COMMIT_TIMESTAMP%%|${CI_COMMIT_TIMESTAMP}|g"
         -e "s|%%JOB_ID%%|${CI_JOB_ID}|g"
@@ -62,6 +65,8 @@ review:
   extends: .deploy
   rules:
     - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+  before_script:
+    - BASE_URL="https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-${ROOT_RELATIVE_NAMESPACE}/${CI_PROJECT_NAME}/-/jobs/$CI_JOB_ID/artifacts/public/"
   environment:
     name: "review $CI_COMMIT_BRANCH"
     url: "https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-${ROOT_RELATIVE_NAMESPACE}/${CI_PROJECT_NAME}/-/jobs/$CI_JOB_ID/artifacts/public/index.html"