diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b3661bb95a6596be61af19c2db75babdea45c9d..a8945c3d924de7e6cef9f40bcad01e8d3163e219 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,6 @@ include:
 
 stages:
   - build
-  - publish
   - deploy
 
 ####
@@ -92,8 +91,8 @@ Build Lambda:
   extends:
     - .gradle
   script:
-    - ./gradlew --no-daemon assemble
-    - ./gradlew --no-daemon libs
+    - ./gradlew assemble
+    - ./gradlew libs
   artifacts:
     expire_in: 1 yr
     paths:
@@ -105,7 +104,7 @@ Unit Tests:
     - .gradle
   coverage: '/Total.*?([0-9]{1,3})%/'
   script:
-    - ./gradlew --no-daemon check
+    - ./gradlew check
     - cat ${JACOCO_HTML_DIR}/index.html
   artifacts:
     paths:
@@ -140,14 +139,14 @@ Build WS Image:
 Maven:
   extends:
     .gradle
-  stage: publish
+  stage: deploy
   only:
     - tags@ghsc/nshmp/nshmp-ws
   script:
     - ./gradlew publish -P version=${CI_COMMIT_TAG}
 
 Trigger nshmp-deploy:
-  stage: publish
+  stage: deploy
   only:
     - master@ghsc/nshmp/nshmp-haz-v2
     - tags@ghsc/nshmp/nshmp-haz-v2
diff --git a/Dockerfile b/Dockerfile
index 9289bafed0957994af1be836e790e6ca073cd24e..8fe300315d5f2fc1cd21dd23013a3af787d7c2cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,6 @@ WORKDIR ${builder_workdir}
 
 COPY . .
 
-RUN env
 RUN ./gradlew assemble
 
 ####
diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle
index 9e74b09fc9aa2d9fb545d7cae0fd30af9f1c9e18..af7a2e257ba46a63e64e67c82c0b3e5e7d168701 100644
--- a/gradle/repositories.gradle
+++ b/gradle/repositories.gradle
@@ -31,13 +31,11 @@ repositories {
     url "https://code.usgs.gov/api/v4/groups/160/-/packages/maven"
     name "GitLab"
     if (System.getenv("CI_JOB_TOKEN") != "null") {
-      print "CI_JOB_TOKEN: " + System.getenv("CI_JOB_TOKEN")
       credentials(HttpHeaderCredentials) {
         name = "Job-Token"
         value = System.getenv("CI_JOB_TOKEN")
       }
     } else {
-      print "GITLAB_TOKEN: " + System.getenv("GITLAB_TOKEN")
       credentials(HttpHeaderCredentials) {
         name = "Private-Token"
         value = System.getenv("GITLAB_TOKEN")
diff --git a/ws.Dockerfile b/ws.Dockerfile
index 0775617820d500d902910c2f7d89504c5193d96f..4d9afdad56cca2cd0b290849c055c7252f41dda4 100644
--- a/ws.Dockerfile
+++ b/ws.Dockerfile
@@ -37,6 +37,7 @@ ENV CI_JOB_TOKEN ${ci_job_token}
 WORKDIR ${builder_workdir}
 
 COPY . .
+
 RUN ./gradlew assemble
 
 ####