diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbd64d9ca93082271727ae4f1e82c9acdc91f9d8..a8728f43546527621bfa1321fa2afd21bf8f56e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
+  IMAGE_NAME: ${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
   JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
   JUNIT_FILES: src/lib/build/test-results/test/TEST-*.xml
   REPORTS_DIR: src/lib/build/reports
@@ -142,20 +142,6 @@ default:
 # Stage: build
 ####
 
-CHS Registry:
-  extends:
-    - .docker-build
-  variables:
-    DOCKER_BUILD_ARGS: |
-      BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
-      FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
-      CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
-      CI_JOB_TOKEN=${CI_JOB_TOKEN}
-      CI_PROJECT_URL=${CI_PROJECT_URL}
-    REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
-    TAG: build
-    UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static
-
 Code Registry:
   before_script:
     - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
@@ -169,7 +155,7 @@ Code Registry:
       FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
     REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
     TAG: dev
-    UPSTREAM_PATH: ghsc/nshmp/nshmp-ws
+    UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static
 
 Build Project:
   script:
@@ -204,7 +190,6 @@ YAML Lint:
 
 Trigger AWS Deployment:
   needs:
-    - CHS Registry
     - Code Registry
   rules:
     -