diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9582664ef1d82740b50d280c7d48669a900807bd..5e2dfc973ea7d550b15949e846ba1b208a47e482 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,7 +77,7 @@ stages:
     - ln -s buildah /usr/bin/docker
     - dnf install -y --nodocs git
     - git config --global --add safe.directory $(pwd)
-    - echo "${DOCKER_HUB_PASSWORD}" | buildah login -u "${DOCKER_HUB_USER}" --password-stdin docker.io
+    - echo "${REGISTRY_PASSWORD}" | buildah login -u "${REGISTRY_USERNAME}" --password-stdin registry.gitlab.com
     - |
       if [ "$CI_PIPELINE_SOURCE" == "schedule" ]; then
         echo 'Running nightly build script'
diff --git a/build_containers.sh b/build_containers.sh
index 0e57327c2e42fcb01d493c861c09248dca22ee34..602cd93eaac31580c57d1ef42cbf9d874e87e07a 100755
--- a/build_containers.sh
+++ b/build_containers.sh
@@ -15,10 +15,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
     for DOCKERFILE in "${DOCKERFILES[@]}"
     do
       DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
-      docker build -t drupalci/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
+      docker build -t ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
       BUILDRESULT=$?
       if [ ${BUILDRESULT} -eq 0 ]; then
-          docker push drupalci/${DOCKERTAG#db-}:${GITBRANCH}
+          docker push ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH}
           #TODO: this currently assumes that the only containers we are working on are the php containers.
           # Legacy from when this was a Jenkins script
           #if [ "${GITBRANCH}" != "production" ]; then
diff --git a/build_head_containers.sh b/build_head_containers.sh
index ec7dd7167d86ca4d99343a8de6825adf3d8872f4..27f624e0c3f672eff03d129f159f09fba91cf823 100755
--- a/build_head_containers.sh
+++ b/build_head_containers.sh
@@ -17,10 +17,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
     for DOCKERFILE in "${DOCKERFILES[@]}"
     do
       DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
-      docker build --no-cache -t drupalci/${DOCKERTAG}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
+      docker build --no-cache -t ${REGISTRY_PATH}/${DOCKERTAG}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
       BUILDRESULT=$?
       if [ ${BUILDRESULT} -eq 0 ]; then
-          docker push drupalci/${DOCKERTAG}:${GITBRANCH}
+          docker push ${REGISTRY_PATH}/${DOCKERTAG}:${GITBRANCH}
       fi
     done
 fi
diff --git a/build_nightly.sh b/build_nightly.sh
index 347a57fb68e19ec9cf3c611018dfe09ca4f0e7a3..c7ba3787add77b5d77e6d4277728ecede40462e1 100755
--- a/build_nightly.sh
+++ b/build_nightly.sh
@@ -13,10 +13,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
     for DOCKERFILE in "${DOCKERFILES[@]}"
     do
       DOCKERTAG=$(echo ${DOCKERFILE} | awk 'BEGIN {FS="/";} {print $1"-"$2}')
-      docker build -t drupalci/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
+      docker build -t ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH} ./${DOCKERFILE%/Dockerfile}
       BUILDRESULT=$?
       if [ ${BUILDRESULT} -eq 0 ]; then
-          docker push drupalci/${DOCKERTAG#db-}:${GITBRANCH}
+          docker push ${REGISTRY_PATH}/${DOCKERTAG#db-}:${GITBRANCH}
       fi
     done
 fi