diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf51fe72f54932d6f7290d3e91302a3e02f7f0dc..f4973dbfbbf001dd0608a025e3667e80aec85df3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,10 @@ workflow:
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH
 
+default:
+  tags:
+    - nshmp
+
 ####
 # Environment Templates
 ####
@@ -140,14 +144,6 @@ workflow:
 # Java Templates
 ####
 
-##
-# General Java setup
-##
-.java:
-  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
-  stage: build
-  tags:
-    - development
 
 ####
 # Stage: build
@@ -166,16 +162,16 @@ Build Image:
     UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static
 
 Build Project:
-  extends:
-    - .java
+  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew assemble
+  stage: build
 
 Markdown Lint:
-  extends:
-    - .java
+  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew markdownlint
+  stage: build
 
 Unit Tests:
   # artifacts:
@@ -184,17 +180,17 @@ Unit Tests:
   #   reports:
   #     junit: ${JUNIT_FILES}
   # coverage: '/Total.*?([0-9]{1,3})%/'
-  extends:
-    - .java
+  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew check
     # - cat ${JACOCO_HTML_DIR}/index.html
+  stage: build
 
 YAML Lint:
-  extends:
-    - .java
+  image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
   script:
     - ./gradlew yamllint
+  stage: build
 
 ####
 # Stage: trigger
diff --git a/gradle.properties b/gradle.properties
index 026e74f91287268271a8bf58555e25972de748e3..33e58e7cd9cd9e17fb4a1aab904938409ee454b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ netcdfVersion = 5.5.2
 nodePluginVersion = 3.0.1
 nodeVersion = 16.3.0
 nshmpLibVersion = 1.0.6
-nshmpWsUtilsVersion = 0.3.7
+nshmpWsUtilsVersion = 0.3.9
 openApiVersion = 4.0.0
 shadowVersion = 7.1.1
 slfVersion = 1.7.30