diff --git a/.zuul.yaml b/.zuul.yaml
index c58af95..c2648b8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,24 +1,22 @@
 - secret:
-    name: statusbot-opendev-quayio
+    name: statusbot-opendev-dockerhub
     data:
-      quay.io:
-        username: opendevorg+opendevrobot
-        password: !encrypted/pkcs1-oaep
-          - j//Ad32wTEjWWhbh6R1NEfE0oebM/WfsNNFeSeenOpiGDNY20f8wamOp0eyxKHZ0fZ5rv
-            Njqg65I4VTBTuU7gHilAPT5Wf0CzK8kE5neEZp7ZB2fUWP4c5/RaEGCGz6cI65xIhUGPE
-            eoqN/OkmO09l6MMiBi1zZ3HCcWWjHMAijcP79jQL4cODIyVMTv7wLeUxE5qQgyyVs1Lkq
-            RE9HE4pltBA+Om/dgieXtinODhb06BATOcrogJ4CAAmqlk1MKlv9qzcNUbfucz3t0j7Z5
-            wv4ill2REHnUPCu4rn5UiupNG/g8s1qa06NUP6Vw3EI7Y32PN1IgLTFddz5Cj1QgJhiKn
-            W5dgZ9zwBHGKGeAy1TnCR8peQw5RZ/vmZHRRQMeyQVXNX0RMMYSUNqkPfMINwjq7X5h76
-            NhRCYHloR+J770fIPmGp66S/pG1lpCewWecOspVZOugOLdZ4elmaWmbzwCxNInE/GO7wK
-            0wCD9xc2f5eID2FhbQC9O4R3nzS7YKB7uexPHBe3pyconfRunnYgGJWgXWr6XWzYvyNF/
-            Prr6kuyBUI1FBoXfItxhWAC4EhjRFH1ZVueRXj13srPxDGfWbiKXm/PgTNo3WYH5CrPEy
-            pJP9aiQx9wM9VY1CTH1hYBG5aMazekxeGPvqv2WZgWZKa5QD16IgyT9aRh6w1I=
-        # No api token because we won't need to create new statusbot repos
+      username: opendevzuul
+      password: !encrypted/pkcs1-oaep
+        - iNW5LmF+l127d5Tsbku/SoFSHv4+f5Y6GBKHRbdODzR2hNt+ZhEOGvJxRIg+majHdX+Qs
+          2ds7KISBocOYc1W20ro5w2R6leNMlSaS8N/9zsA0vhEVXoc3vaCe3EC1/fdmcQZYPkjnY
+          HNwh+5WqYC5zwAiimyNwp6f3amHYs/TyrgRagzbCJe1cSIkuXbW9U4gT1tOBDxOFh9GzN
+          PnnaiXmEhuN3X3a39dn1+HhDdNcY0xGNkzXDkemqQznlV/zx1AssEhjBfzFGZll55J/jW
+          REdURvim8/8F16sK5XMFRBuIw3a9PARt70pIlrwMAwPwpzrFCHOVCyyw0+Zlm0DzppcXc
+          dxlX0ZBPdQLPaWw3qN5Hz1mxH6fr2o4muMFASuFXGXpbdiGKBbHOOKX7V7tfr62JXVcKG
+          bglaRXrl3nMiMsroEuqIOXYxfpvDbuWlX8vbkdI6bhunkA81tdjytSTOCU7fXeucAeVtp
+          MpqPwuSGvUcU+DIbOTSP+EVHq7/096ERzEuGx1h3SI05HojDaYRop7GYuCoFO7KkxNt+5
+          X4zziFreoJn5ixwr+/8rqlpXmylbKknKBolZAiBVGsGF5cKW3LGoMr9NPIc2MjEqnJzz2
+          Y9BD/RSAX1HMiPdzSEKefNUYqG8lEsWGQoSisyAw357laBYYJ1q/m0nxAFqqWU=
 
 - job:
     name: statusbot-build-opendev-image
-    parent: opendev-build-container-image
+    parent: opendev-build-docker-image
     description: Build OpenDev Docker images for statusbot
     provides: statusbot-container-image
     requires:
@@ -26,21 +24,14 @@
       - python-base-3.10-bullseye-container-image
     vars: &statusbot_opendev_image_vars
       zuul_work_dir: src/opendev.org/opendev/statusbot
-      promote_container_image_method: intermediate-registry
-      promote_container_image_job: statusbot-upload-opendev-image
-      container_command: docker
-      container_images:
+      docker_images:
         - context: .
-          registry: quay.io
-          repository: quay.io/opendevorg/statusbot
-          namespace: opendevorg
-          repo_shortname: statusbot
-          repo_description: An IRC (and more) operational status update bot
+          repository: opendevorg/statusbot
           target: statusbot
 
 - job:
     name: statusbot-upload-opendev-image
-    parent: opendev-upload-container-image
+    parent: opendev-upload-docker-image
     description: Build OpenDev statusbot Docker images and upload to Docker Hub.
     provides: statusbot-container-image
     requires:
@@ -48,18 +39,18 @@
       - python-base-3.10-bullseye-container-image
     vars: *statusbot_opendev_image_vars
     secrets:
-      - name: container_registry_credentials
-        secret: statusbot-opendev-quayio
+      - name: docker_credentials
+        secret: statusbot-opendev-dockerhub
         pass-to-parent: true
 
 - job:
     name: statusbot-promote-opendev-image
-    parent: opendev-promote-container-image
+    parent: opendev-promote-docker-image
     description: Promote previously uploaded statusbot Docker images.
     vars: *statusbot_opendev_image_vars
     secrets:
-      - name: container_registry_credentials
-        secret: statusbot-opendev-quayio
+      - name: docker_credentials
+        secret: statusbot-opendev-dockerhub
         pass-to-parent: true
 
 - project:
diff --git a/Dockerfile b/Dockerfile
index 2457e3b..fbd199b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.
 
-FROM quay.io/opendevorg/python-builder:3.10-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM quay.io/opendevorg/python-base:3.10-bullseye as statusbot
+FROM docker.io/opendevorg/python-base:3.10-bullseye as statusbot
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep