diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 7a82b73d5baa339d7450bf8c3fbfeb5e2d589f3e..7a350d0d40553abebb153312dd23df9f80249ce9 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -395,7 +395,7 @@ export_env BOB_PREFIX_PATH
 
 # Setup default documentation server
 if [ -z "${CI_COMMIT_TAG}" ]; then
- DEFSRV="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/"
+ DEFSRV="${DOCSERVER}/software/bob/docs/bob/%s/master/"
 else
   DEFSRV="http://pythonhosted.org/%s/"
 fi
@@ -406,7 +406,7 @@ else
 fi
 if [ "${VISIBILITY}" != "public" ]; then
   # If private or internal, allow it to depend on other internal documents
-  BOB_DOCUMENTATION_SERVER="${BOB_DOCUMENTATION_SERVER}|${DOCSERVER}/private/docs/latest/bob/%s/master/"
+  BOB_DOCUMENTATION_SERVER="${BOB_DOCUMENTATION_SERVER}|${DOCSERVER}/private/docs/bob/%s/master/"
 fi
 unset DEFSRV
 export_env BOB_DOCUMENTATION_SERVER
@@ -421,7 +421,7 @@ export_env SSL_CERT_FILE
 # See: https://gitlab.idiap.ch/bob/bob.admin/issues/2
 
 # Prefix differs between private & public repos
-DOC_SERVER_PREFIX="-upload/${CI_PROJECT_PATH}/docs"
+DOC_SERVER_PREFIX="-upload/docs/${CI_PROJECT_PATH}/"
 if [[ "${VISIBILITY}" == "public" ]]; then
   DOC_SERVER_PREFIX="public${DOC_SERVER_PREFIX}"
 else