diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39b78e0853060b307d982800080cafc28a3f646a..7b28bebc150ebb397eba41d4f42815644fbd7a61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,6 @@ variables:
     POSTGRES_DB: archive
     POSTGRES_USER: "archive"
     POSTGRES_PASSWORD: "docker"
-    BASE_REGISTRY_URL: "brooks.aoc.nrao.edu:5000/ssa-docker/workspaces"
 
 image: docker:19.03.12
 
@@ -49,8 +48,8 @@ pull db image:
     interruptible: true
     stage: pull-db
     script:
-        - echo "$REGISTRY_URL_PASS" | docker login --username "$REGISTRY_URL_USER" --password-stdin $BASE_REGISTRY_URL
-        - docker pull ${BASE_REGISTRY_URL}/db:workspaces
+        - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
+        - docker pull ${REGISTRY_URL}/db:workspaces
 
 ###############################################
 # Build Pexes
diff --git a/ci/cleanup.template.yml b/ci/cleanup.template.yml
index bd74045aba7373ed1e1a3c29aec08ad0b43494e1..a4b2f388ba989bd5dc5c35de6728d915153821be 100644
--- a/ci/cleanup.template.yml
+++ b/ci/cleanup.template.yml
@@ -1,11 +1,11 @@
 # Cleanup Images Template
 .cleanup:
     script:
-        - NAME="${BASE_REGISTRY_URL}/${SERVICE_NAME}"
+        - NAME="${REGISTRY_URL}/${SERVICE_NAME}"
         - |
             printf "%s\n" "- Removing Images -" \
             "${NAME}:${IMAGE_TAG}"
-        - docker image rm --force "${BASE_REGISTRY_URL}/${SERVICE_NAME}:${IMAGE_TAG}"
+        - docker image rm --force "${REGISTRY_URL}/${SERVICE_NAME}:${IMAGE_TAG}"
     rules:
       - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
         variables:
diff --git a/ci/push.template.yml b/ci/push.template.yml
index 3119fc16526add787c722d59946ef04e7fb0580f..74751d3b8901eb2e18987ecd98d18cf470fe28a5 100644
--- a/ci/push.template.yml
+++ b/ci/push.template.yml
@@ -1,8 +1,8 @@
 # Push Images Template
 .push:
     script:
-        - echo "$REGISTRY_URL_PASS" | docker login --username "$REGISTRY_URL_USER" --password-stdin $BASE_REGISTRY_URL
-        - NAME="${BASE_REGISTRY_URL}/${SERVICE_NAME}"
+        - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
+        - NAME="${$REGISTRY_URL}/${SERVICE_NAME}"
         - docker push ${NAME}:${IMAGE_TAG}
     rules:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'