diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6580a72cc184d40f41bcf26c6f3eddddadc24548..4e0afc293ea3b33b3bdbf9c544f571dba8290437 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ variables:
   CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
   DOCKER_DIR: docker-images
   DOCKER_TAR: ${DOCKER_DIR}/app.tar
-  GITLAB_TOKEN: '${GITLAB_API_TOKEN}'
   IMAGE_NAME: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}
   JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
   JUNIT_FILES: build/test-results/test/TEST-*.xml
@@ -161,7 +160,7 @@ Build Image:
   script:
     - |
       docker build \
-          --build-arg gitlab_token="${GITLAB_TOKEN}" \
+          --build-arg ci_job_token="${CI_JOB_TOKEN}" \
           -t local/${IMAGE_NAME} .
   retry:
     max: 2
@@ -192,7 +191,7 @@ Build/Publish Data Images:
             s3://nshmp-hazard-curves/${data}.nc \
             DATA/${data}.nc;
         docker build \
-            --build-arg gitlab_token="${GITLAB_TOKEN}" \
+            --build-arg ci_job_token="${CI_JOB_TOKEN}" \
             --build-arg netcdf_file="DATA/${data}.nc" \
             -t ${INTERNAL_IMAGE_NAME} .;
         rm DATA/${data}.nc
diff --git a/Dockerfile b/Dockerfile
index 86e00f722b306e84c05d20630844e0f821128b4b..1cd6cc9b19f1907bbe431fc6285a90a524418b82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,14 @@ FROM usgs/centos:8 as builder
 
 ENV LANG="en_US.UTF-8"
 
-ARG gitlab_token
+ARG gitlab_token=null
+ARG ci_job_token=null
 ARG libs_dir
 ARG jar_file
 ARG workdir
 
-ENV GITLAB_TOKEN ${git_username}
+ENV GITLAB_TOKEN ${gitlab_token}
+ENV CI_JOB_TOKEN ${ci_job_token}
 
 WORKDIR ${workdir}