diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 249a8f7421be9d42b52bbc5642a86f0b9bb28d64..29c8dacbc25f4772d66855c168ec708863ca9668 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,9 +43,6 @@ stages:
     - .tags::development
   stage: build
   image: usgs/java:11
-  only:
-    - branches
-    - master@ghsc/nshmp/nshmp-netcdf
 
 ####
 # Template: Deploy to Docker Swarm
@@ -164,9 +161,9 @@ Unit Tests:
 #     - rm -rf /root/.docker/config.json
 
 Maven:
-  image: usgs/java:11
+  extends:
+    - .gradle
   stage: publish
-  extends: .dev-tags
   only:
     - tags@ghsc/nshmp/nshmp-netcdf
   script: