diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a977fdc586207a0101569b40bf2d2cd6f898aaa..ef9934cdcc6804e71e8b310a430a8911259d635b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,12 +104,12 @@ default:
       docker build \
         ${BUILD_ARGS} \
         --pull \
-        --tag "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" \
+        --tag "${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" \
         --file "${CI_PROJECT_DIR}/${DOCKERFILE}" \
         "${CI_PROJECT_DIR}/.";
-    - docker push "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
-    - latest_image_name="${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
-    - docker tag "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" "${latest_image_name}";
+    - docker push "${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
+    - latest_image_name="${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
+    - docker tag "${REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" "${latest_image_name}";
     - docker push "${latest_image_name}";
     - |
       printf "
@@ -120,6 +120,7 @@ default:
   variables:
     DOCKERFILE: Dockerfile
     IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
+    REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
 
 ####
 # Stage: init
@@ -152,7 +153,7 @@ Build Project:
 # Stage: Image
 ####
 
-Build Image:
+CHS Registry:
   extends:
     - .docker-build
   needs:
@@ -165,6 +166,24 @@ Build Image:
       BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20
       FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
       USE_DIST=true
+      REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
+
+Container Registry:
+ before_script:
+    - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
+  extends:
+    - .docker-build
+  needs:
+    - Build Project
+  stage: image
+  tags:
+    - build
+  variables:
+    DOCKER_BUILD_ARGS: |
+      BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:20
+      FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
+      USE_DIST=true
+      REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
 
 ####
 # Stage: Security