diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 64749729a7591f000c0192629c473674d4184a70..baef86f8c97f3bf0ea5d711b1f8e1d40cfbaa680 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -272,18 +272,19 @@ check_env CONDA_FOLDER
 check_env CONDA_ENV
 export_env BOB_PREFIX_PATH
 
+# Setup default documentation server
 if [ -z "${CI_BUILD_TAG}" ]; then
   DEFSRV="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/"
-  if [ -z "${BOB_DOCUMENTATION_SERVER}" ]; then
-    BOB_DOCUMENTATION_SERVER="${DEFSRV}"
-  else
-    BOB_DOCUMENTATION_SERVER="${BOB_DOCUMENTATION_SERVER}|${DEFSRV}"
-  fi
-  unset DEFSRV
-  export_env BOB_DOCUMENTATION_SERVER
 else
-  log_info "Building tag, not setting BOB_DOCUMENTATION_SERVER"
+  DEFSRV="http://pythonhosted.org/%s/"
+fi
+if [ -z "${BOB_DOCUMENTATION_SERVER}" ]; then
+  BOB_DOCUMENTATION_SERVER="${DEFSRV}"
+else
+  BOB_DOCUMENTATION_SERVER="${BOB_DOCUMENTATION_SERVER}|${DEFSRV}"
 fi
+unset DEFSRV
+export_env BOB_DOCUMENTATION_SERVER
 
 # sets up certificates for curl and openssl
 CURL_CA_BUNDLE="${SCRIPTS_DIR}/cacert.pem"