diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29c8dacbc25f4772d66855c168ec708863ca9668..08981c28fe44c9e374dc4330d44fdc1ea7fda017 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,9 @@ Build Image:
     - .build
   variables:
     DOCKER_BUILD_ARGS: |
-      ci_job_token="${CI_JOB_TOKEN}"
+      BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+      FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+      ci_job_token=${CI_JOB_TOKEN}
 
 Unit Tests:
   extends:
diff --git a/Dockerfile b/Dockerfile
index 3ac48a8f88035483b9e7c2fa5c580c1a5e0bfe56..6c5bba9f9368666bd34ed16812d74b574b51b2f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ COPY settings.gradle .
 COPY src src
 COPY openapi.properties .
 
-RUN ./gradlew --no-daemon assemble \
+RUN ./gradlew assemble \
     && mv ${libs_dir}/*-all.jar ${jar_file}
 
 ####
diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle
index 784c51c87da43d277fdecb3fe69d6341565211bd..6a505b02462b753ba05b3c529fd684aa00243ccb 100644
--- a/gradle/repositories.gradle
+++ b/gradle/repositories.gradle
@@ -34,7 +34,7 @@ repositories {
   maven {
     url "https://code.usgs.gov/api/v4/groups/160/-/packages/maven"
     name "GitLab"
-    if (System.getenv('CI_JOB_TOKEN')) {
+    if (System.getenv("CI_JOB_TOKEN") != null) {
       credentials(HttpHeaderCredentials) {
         name = 'Job-Token'
         value = System.getenv("CI_JOB_TOKEN")