diff --git a/docker/accessbot/Dockerfile b/docker/accessbot/Dockerfile
index edc9fa3cf8..1a6adccc22 100644
--- a/docker/accessbot/Dockerfile
+++ b/docker/accessbot/Dockerfile
@@ -15,7 +15,7 @@
 
 # Trigger rebuild - Thu Aug  7 05:51:27 PM UTC 2025
 
-FROM docker.io/opendevorg/python-base:3.12-bookworm
+FROM quay.io/opendevorg/python-base:3.12-bookworm
 
 RUN pip install pyyaml irc
 COPY accessbot.py /usr/local/bin/accessbot.py
diff --git a/docker/ircbot/Dockerfile b/docker/ircbot/Dockerfile
index 722ed54306..05724caa76 100644
--- a/docker/ircbot/Dockerfile
+++ b/docker/ircbot/Dockerfile
@@ -15,7 +15,7 @@
 
 # Trigger rebuild - Thu Aug  7 05:51:27 PM UTC 2025
 
-FROM docker.io/opendevorg/python-builder:3.12-bookworm as builder
+FROM quay.io/opendevorg/python-builder:3.12-bookworm as builder
 ARG ZUUL_SIBLINGS=""
 
 RUN apt-get update \
@@ -27,7 +27,7 @@ COPY . /tmp/src
 
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.12-bookworm as ircbot
+FROM quay.io/opendevorg/python-base:3.12-bookworm as ircbot
 
 COPY --from=builder /output /output
 
diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile
index 8dcd6daefb..d9fde8683f 100644
--- a/docker/matrix-eavesdrop/Dockerfile
+++ b/docker/matrix-eavesdrop/Dockerfile
@@ -15,12 +15,12 @@
 
 # Trigger rebuild - Thu Aug  7 05:51:27 PM UTC 2025
 
-FROM docker.io/opendevorg/python-builder:3.12-bookworm as builder
+FROM quay.io/opendevorg/python-builder:3.12-bookworm as builder
 
 COPY src /tmp/src
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.12-bookworm as eavesdrop
+FROM quay.io/opendevorg/python-base:3.12-bookworm as eavesdrop
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep \
diff --git a/zuul.d/docker-images/accessbot.yaml b/zuul.d/docker-images/accessbot.yaml
index 1c1e566ee7..0c0a01ff6a 100644
--- a/zuul.d/docker-images/accessbot.yaml
+++ b/zuul.d/docker-images/accessbot.yaml
@@ -7,6 +7,7 @@
     provides: accessbot-container-image
     vars: &accessbot_vars
       promote_container_image_job: system-config-upload-image-accessbot
+      container_command: docker
       container_images:
         - context: docker/accessbot
           registry: quay.io
diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml
index d8a2cf0572..4ae4becc57 100644
--- a/zuul.d/docker-images/eavesdrop.yaml
+++ b/zuul.d/docker-images/eavesdrop.yaml
@@ -9,6 +9,7 @@
     provides: matrix-eavesdrop-container-image
     vars: &matrix-eavesdrop_vars
       promote_container_image_job: system-config-upload-image-matrix-eavesdrop
+      container_command: docker
       container_images:
         - context: docker/matrix-eavesdrop
           registry: quay.io
diff --git a/zuul.d/docker-images/ircbot.yaml b/zuul.d/docker-images/ircbot.yaml
index 40f638e40d..47630f174c 100644
--- a/zuul.d/docker-images/ircbot.yaml
+++ b/zuul.d/docker-images/ircbot.yaml
@@ -11,6 +11,7 @@
       - opendev/meetbot
     vars: &ircbot_vars
       promote_container_image_job: system-config-upload-image-ircbot
+      container_command: docker
       container_images:
         - context: docker/ircbot
           target: ircbot