diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 541f98caa55d2fd3a83f8d3861bd4369d0fd43ed_LmdpdGxhYi1jaS55bWw=..3d6d5b5c75dd209238f6105e624b56504874c136_LmdpdGxhYi1jaS55bWw= 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@
 
 ### For services that need a docker daemon
 .docker_job: &docker_job
-  image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
   variables:
     DOCKER_DRIVER: overlay2
     DOCKER_HOST: tcp://docker:2375
@@ -174,7 +174,7 @@
 generate-facts:
   extends: .gems-cache
   stage: prepare
-  image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
   script:
     - mkdir -p build_facts
     - bundle exec omnibus manifest gitlab -l nothing > build_facts/version-manifest.json
diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml
index 541f98caa55d2fd3a83f8d3861bd4369d0fd43ed_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..3d6d5b5c75dd209238f6105e624b56504874c136_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644
--- a/gitlab-ci-config/dev-gitlab-org.yml
+++ b/gitlab-ci-config/dev-gitlab-org.yml
@@ -257,7 +257,7 @@
       when: manual
 
 .aws_marketplace_release: &aws_marketplace_release
-  image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
   stage: aws-marketplace-release
   script:
     - export AWS_ACCESS_KEY_ID=$AWS_AMI_ACCESS_KEY_ID
@@ -1147,7 +1147,7 @@
 
 create-gitlab-release:
   stage: package-and-image-release
-  image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
   needs:
     - job: AWS
       artifacts: true
diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml
index 541f98caa55d2fd3a83f8d3861bd4369d0fd43ed_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..3d6d5b5c75dd209238f6105e624b56504874c136_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644
--- a/gitlab-ci-config/gitlab-com.yml
+++ b/gitlab-ci-config/gitlab-com.yml
@@ -229,7 +229,7 @@
 update-gems-cache:
   extends: .gems-cache
   stage: update-cache
-  image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
   before_script: !reference [.install-gems]
   script:
     - echo "Cache is up to date!"
@@ -699,7 +699,7 @@
       - dependency_report.txt
 
 dependency_update:
-  image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/distribution_ci_tools:${BUILDER_IMAGE_REVISION}"
   stage: prepare
   before_script: []
   script: