diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12415fa118b715850fc815739531503d92731273..730b9a5138d3dc98c3a1f5ce64924dcd4a306722 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,10 @@ stages:
   - build
   - trigger
 
+default:
+  tags:
+    - nshmp
+
 ####
 # Environment Templates
 ####
@@ -105,8 +109,6 @@ stages:
     - docker tag "${env_image_name}" "${latest_image_name}"
     - docker push "${latest_image_name}"
   stage: build
-  tags:
-    - build
   variables:
     DOCKERFILE: Dockerfile
     DOCKER_BUILD_ARGS: |
@@ -123,8 +125,6 @@ stages:
 .java:
   image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   stage: build
-  tags:
-    - development
 
 ####
 # Stage: build