diff --git a/playbooks/roles/accessbot/files/accessbot b/playbooks/roles/accessbot/files/accessbot
index f21506ee4c..6da815b8ad 100644
--- a/playbooks/roles/accessbot/files/accessbot
+++ b/playbooks/roles/accessbot/files/accessbot
@@ -17,4 +17,4 @@
 exec docker run --rm --net=host \
   -v/etc/accessbot:/etc/accessbot \
   -v/var/log/accessbot:/var/log/accessbot \
-  docker.io/opendevorg/accessbot
+  quay.io/opendevorg/accessbot
diff --git a/playbooks/roles/accessbot/tasks/main.yaml b/playbooks/roles/accessbot/tasks/main.yaml
index 08beff9dad..07c230d42d 100644
--- a/playbooks/roles/accessbot/tasks/main.yaml
+++ b/playbooks/roles/accessbot/tasks/main.yaml
@@ -33,4 +33,4 @@
     logrotate_file_name: /var/log/accessbot/accessbot.log
 
 - name: Pull latest image
-  command: docker pull docker.io/opendevorg/accessbot
+  command: docker pull quay.io/opendevorg/accessbot
diff --git a/playbooks/roles/limnoria/files/docker-compose.yaml b/playbooks/roles/limnoria/files/docker-compose.yaml
index 4c0935b337..5885507a62 100644
--- a/playbooks/roles/limnoria/files/docker-compose.yaml
+++ b/playbooks/roles/limnoria/files/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   ircbot:
-    image: docker.io/opendevorg/ircbot:latest
+    image: quay.io/opendevorg/ircbot:latest
     network_mode: host
     restart: always
     logging:
diff --git a/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml b/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml
index 03bbdb81ed..7354d1bd00 100644
--- a/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml
+++ b/playbooks/roles/matrix-eavesdrop/files/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   eavesdrop:
-    image: docker.io/opendevorg/matrix-eavesdrop:latest
+    image: quay.io/opendevorg/matrix-eavesdrop:latest
     network_mode: host
     restart: always
     logging:
diff --git a/zuul.d/docker-images/accessbot.yaml b/zuul.d/docker-images/accessbot.yaml
index 8d45b6b267..1c1e566ee7 100644
--- a/zuul.d/docker-images/accessbot.yaml
+++ b/zuul.d/docker-images/accessbot.yaml
@@ -2,13 +2,18 @@
 - job:
     name: system-config-build-image-accessbot
     description: Build a accessbot image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     requires: python-base-3.12-bookworm-container-image
     provides: accessbot-container-image
     vars: &accessbot_vars
-      docker_images:
+      promote_container_image_job: system-config-upload-image-accessbot
+      container_images:
         - context: docker/accessbot
-          repository: opendevorg/accessbot
+          registry: quay.io
+          repository: quay.io/opendevorg/accessbot
+          namespace: opendevorg
+          repo_shortname: accessbot
+          repo_description: IRC acl management bot
     files: &accessbot_files
       - docker/accessbot/
       - docker/python-base/
@@ -16,7 +21,7 @@
 - job:
     name: system-config-upload-image-accessbot
     description: Build and upload a accessbot image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     requires: python-base-3.12-bookworm-container-image
     provides: accessbot-container-image
     vars: *accessbot_vars
@@ -25,6 +30,6 @@
 - job:
     name: system-config-promote-image-accessbot
     description: Promote a previously published accessbot image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *accessbot_vars
     files: *accessbot_files
diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml
index e465d1e08d..d8a2cf0572 100644
--- a/zuul.d/docker-images/eavesdrop.yaml
+++ b/zuul.d/docker-images/eavesdrop.yaml
@@ -2,22 +2,27 @@
 - job:
     name: system-config-build-image-matrix-eavesdrop
     description: Build a matrix-eavesdrop image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     requires: &matrix-eavesdrop_requires
       - python-base-3.12-bookworm-container-image
       - python-builder-3.12-bookworm-container-image
     provides: matrix-eavesdrop-container-image
     vars: &matrix-eavesdrop_vars
-      docker_images:
+      promote_container_image_job: system-config-upload-image-matrix-eavesdrop
+      container_images:
         - context: docker/matrix-eavesdrop
-          repository: opendevorg/matrix-eavesdrop
+          registry: quay.io
+          repository: quay.io/opendevorg/matrix-eavesdrop
+          namespace: opendevorg
+          repo_shortname: matrix-eavesdrop
+          repo_description: A matrix log collection bot.
     files: &matrix-eavesdrop_files
       - docker/matrix-eavesdrop/.*
 
 - job:
     name: system-config-upload-image-matrix-eavesdrop
     description: Build and upload a matrix-eavesdrop image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     requires: *matrix-eavesdrop_requires
     provides: matrix-eavesdrop-container-image
     vars: *matrix-eavesdrop_vars
@@ -26,6 +31,6 @@
 - job:
     name: system-config-promote-image-matrix-eavesdrop
     description: Promote a previously published matrix-eavesdrop image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *matrix-eavesdrop_vars
     files: *matrix-eavesdrop_files
diff --git a/zuul.d/docker-images/ircbot.yaml b/zuul.d/docker-images/ircbot.yaml
index 82055be950..40f638e40d 100644
--- a/zuul.d/docker-images/ircbot.yaml
+++ b/zuul.d/docker-images/ircbot.yaml
@@ -2,7 +2,7 @@
 - job:
     name: system-config-build-image-ircbot
     description: Build a ircbot image.
-    parent: system-config-build-image
+    parent: system-config-build-container-image
     requires: &ircbot_requires
       - python-base-3.12-bookworm-container-image
       - python-builder-3.12-bookworm-container-image
@@ -10,10 +10,15 @@
     required-projects: &ircbot_required_projects
       - opendev/meetbot
     vars: &ircbot_vars
-      docker_images:
+      promote_container_image_job: system-config-upload-image-ircbot
+      container_images:
         - context: docker/ircbot
           target: ircbot
-          repository: opendevorg/ircbot
+          registry: quay.io
+          repository: quay.io/opendevorg/ircbot
+          namespace: opendevorg
+          repo_shortname: ircbot
+          repo_description: A limnoria + meetbot IRC bot
           siblings:
             - opendev.org/opendev/meetbot
     files: &ircbot_files
@@ -21,7 +26,7 @@
 - job:
     name: system-config-upload-image-ircbot
     description: Build and upload a ircbot image.
-    parent: system-config-upload-image
+    parent: system-config-upload-container-image
     requires: *ircbot_requires
     provides: ircbot-container-image
     required-projects: *ircbot_required_projects
@@ -31,6 +36,6 @@
 - job:
     name: system-config-promote-image-ircbot
     description: Promote a previously published ircbot image to latest.
-    parent: system-config-promote-image
+    parent: system-config-promote-container-image
     vars: *ircbot_vars
     files: *ircbot_files