diff --git a/Dockerfile b/Dockerfile
index 8fe300315d5f2fc1cd21dd23013a3af787d7c2cf..d1e5a2b6f6afc4154b9e2e91ec4ee5bf6a61c924 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,15 +31,16 @@ FROM ${BUILD_IMAGE} as builder
 
 ARG builder_workdir
 ARG libs_dir
+
+# TODO
+# Remove once nshmp-lib is public
 ARG git_username
 ARG git_password
-ARG gitlab_token=null
-ARG ci_job_token=null
+ARG GITLAB_TOKEN=null
+ARG CI_JOB_TOKEN=null
 
 ENV GIT_NSHMP_USERNAME ${git_username}
 ENV GIT_NSHMP_PASSWORD ${git_password}
-ENV GITLAB_TOKEN ${gitlab_token}
-ENV CI_JOB_TOKEN ${ci_job_token}
 
 WORKDIR ${builder_workdir}