diff --git a/.zuul.yaml b/.zuul.yaml
index 59cd89d..7b9341b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,22 +1,14 @@
 - secret:
-    name: ptgbot-opendev-dockerhub
+    name: ptgbot-opendev-quayio
     data:
-      username: opendevzuul
-      password: !encrypted/pkcs1-oaep
-        - tpQrxd7cqPwjjKsSbDOH0GqNuFZudJDQvY43qFV8tmKh3zRTjfA5uVX5b3J60SHHYIez9
-          9W/SU0pVm0VfH0iL9plMKoVij6LLpFlxGePiab7SimjQuiDoP2aBles7AbmdCxyNrs6M5
-          WCHSsg+6bE79z0r2+2+yoFYxGlbY7beRpHXkPxGpFn/g9YpOFnAch3UcnAEDnZHamxufp
-          8wIZ//UYP4Z6hwv0PcX9caw/MU8bnUGDQXBtjErohtsi8+cELKXvHBT4WU33wpf//C6MD
-          KQ3nd7NJfDtIYaN4PGOw2mlbQFq0lF4PfxlhOHjC2+k9vz+EoW85Hkfcw986CE+JINq3p
-          k5t8GbXTDu86kkBzU6Gk+D7EVOluKZbGuTB4pcyZdjlMbty274y8xQXnplTp2rKIAdPeP
-          G1AcXEvZmfR0YEKg8UuR+ZJQx3Au1uEJAEpkNwH1Tbt54K/qyw1gAQDcHHkJ3odsKJe5V
-          c97Kn7roGCzwi7UWOd+XR0hvcNTUfotyBFQJzDe1+NHc6IQGQ1DeBVz5FD1JIVoj+W65E
-          XymsiQmZ+B+AxFnINS8PUTkJtlQc7zoMP/dtcYTbxtJB3XJQTOiaD00KGmr6RDWu3Uuw+
-          T6l/0vVdT7SeDY0v5wib2Elgl1Vnmxkte9oiUD9F++dW/rw42Cjlq5WqRlodaU=
+      quay.io:
+        username: opendevzuul
+        password: TODO
+        # No api token as we won't need to create new repos for ptgbot
 
 - job:
     name: ptgbot-build-opendev-image
-    parent: opendev-build-docker-image
+    parent: opendev-build-container-image
     description: Build OpenDev Docker images for statusbot
     requires:
       - python-builder-3.9-bullseye-container-image
@@ -24,14 +16,21 @@
     provides: ptgbot-container-image
     vars: &ptgbot_opendev_image_vars
       zuul_work_dir: src/opendev.org/openstack/ptgbot
-      docker_images:
+      promote_container_image_method: intermediate-registry
+      promote_container_image_job: ptgbot-upload-opendev-image
+      container_command: docker
+      container_images:
         - context: .
+          registry: quay.io
           repository: opendevorg/ptgbot
+          namespace: opendevorg
+          repo_shortname: ptgbot
+          repo_description: An IRC bot for managing team gatherings
           target: ptgbot
 
 - job:
     name: ptgbot-upload-opendev-image
-    parent: opendev-upload-docker-image
+    parent: opendev-upload-container-image
     description: Build OpenDev statusbot Docker images and upload to Docker Hub.
     requires:
       - python-builder-3.9-bullseye-container-image
@@ -39,18 +38,18 @@
     provides: ptgbot-container-image
     vars: *ptgbot_opendev_image_vars
     secrets:
-      - name: docker_credentials
-        secret: ptgbot-opendev-dockerhub
+      - name: container_registry_credentials
+        secret: ptgbot-opendev-quayio
         pass-to-parent: true
 
 - job:
     name: ptgbot-promote-opendev-image
-    parent: opendev-promote-docker-image
+    parent: opendev-promote-container-image
     description: Promote previously uploaded ptgbot Docker images.
     vars: *ptgbot_opendev_image_vars
     secrets:
-      - name: docker_credentials
-        secret: ptgbot-opendev-dockerhub
+      - name: container_registry_credentials
+        secret: ptgbot-opendev-quayio
         pass-to-parent: true
 - project:
     check:
diff --git a/Dockerfile b/Dockerfile
index ea415bc..c331e6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 
-FROM opendevorg/python-builder:3.9-bullseye as builder
+FROM quay.io/opendevorg/python-builder:3.9-bullseye as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM opendevorg/python-base:3.9-bullseye as ptgbot
+FROM quay.io/opendevorg/python-base:3.9-bullseye as ptgbot
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep