diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e5a7329e1447583b8e597f5865fe4f6d06ebf59..cc64ba5f417660642e9748ab2f4a7c59b0c55918 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,10 +74,10 @@ default:
 # Docker in Docker
 ##
 .dind:
-  image: ${CI_REGISTRY}/devops/images/usgs/docker:latest
+  image: docker:latest
   services:
     - alias: docker
-      name: ${CI_REGISTRY}/devops/images/usgs/docker:latest-dind
+      name: docker:dind
   variables:
     DOCKER_DRIVER: overlay2
 
@@ -95,6 +95,7 @@ default:
     - *staging-env
     - *production-env
   script:
+    - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
     - BUILD_ARGS='';
     - |
       for arg in ${DOCKER_BUILD_ARGS}; do
@@ -146,7 +147,6 @@ Init:
     paths:
       - node_modules
   script:
-    - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
     - npm ci
   stage: init