diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1bf2cd77533148f68cec8a453a211c2a1635e66..024d92156aba0c6ed1dbf156a60eab4b6e9798f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
 
 default:
   tags:
-    - nshmp
+    - dev
 
 ####
 # Environment Templates
@@ -189,12 +189,12 @@ Container Registry:
         CI_PROJECT_NAME: nshmp-haz
         DOCKERFILE: Dockerfile
         REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
-        TAG: nshmp
+        TAG: dev
       -
         CI_PROJECT_NAME: nshmp-haz-ws
         DOCKERFILE: ws.Dockerfile
         REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
-        TAG: nshmp
+        TAG: dev
   variables:
     DOCKER_BUILD_ARGS: |
       BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
@@ -242,6 +242,8 @@ NSHM Tests:
     - ./gradlew test${NSHM} --info
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
+  tags:
+    - nshmp
 
 YAML Lint:
   allow_failure: true