diff --git a/.zuul.yaml b/.zuul.yaml
index bdc0e93..2d4509a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,32 +1,48 @@
 - secret:
-    name: zuul-storage-proxy-dockerhub
+    name: zuul-storage-proxy-registry-credentials
     data:
-      username: zuulzuul
-      password: !encrypted/pkcs1-oaep
-        - BkUxcXcPY0rzCPJfmwHcdILp9eSpi0m8JBR1LuFy+kzpeRUr+MQyaoMO8DigywiozoDg2
-          s/dfYZWdDlGKc3+fIYT3XBh7nckUeijz6m249mzqWSv7i2/j9iG2F/iyL6zKVf1bI2nQB
-          aYUeo4RkXed5wYIJcHhmS8s6W6zEd077TrdLJJwD9BlftDwdBZcQGM+Y88AACxleywY/w
-          Uf+F3CKMr8BmjfPm0TPgq86bDMCizw6Hg8maWoTq6lV7c45juTTxXnEMjYwpB45h2ahwu
-          lv3ZhIHaWy7proiFPZ9q8QXHMPRZsCX2r/HO3pkCBagDcd2CQuNzLZhiQY/F6EJCgHetY
-          sLTP8j2FR17U7vrolJSCVrHG9AX6V3PCZfPN+tkHBRuxGwQeFweDJkBw4VBPU8U5tYTAH
-          AXunUw7uzKI7oyLoutK2RJ3Mdl+zBGtEeHiIbeFX/VCEylpHKSc237OR+jSO/qLihNeOi
-          NLxu7D7gtHR2G8pVDU5u9IV5a/nb2FDUQq9wC25IjDcRDbtx9jAYbihRdsEu0idjicJFZ
-          0D/KJJ3teSPbX3t0EwYysgFihfja7R5/UA8gwJtyKaTUugZy7nX0LRY//8g9ZsWcyovaV
-          0JayUGOpbz1AVtH30ieSmwF3uHy2elYtMQb4DvHqL7Ik8cSCeAhVoVNTRdxJyI=
+      quay.io:
+        username: zuul-ci+opendevzuul
+        password: !encrypted/pkcs1-oaep
+          - f+MbgMldK5fRSiudArax0Kfh27tPhXMbwuOnlE3PguACmdiM1iojT5mTXicu4teZaB6w4
+            7nOr9E6sFG+EQq2JgUaCbUKW7CM5sogj/z/7/FWromZmRHBcL82KoEXF2jXB6TVh8QmhD
+            ww0MELKD2IoNEQ/Na2qY8vnF6urMmyxRkJlxhEXqMDGZKQLAzTA/psw4TaQ43M2XRtVs1
+            KyzRIyIoV0QW4TkRLMpADA+zREJw0EQe621XRCEw5+z9dY60i+dim4FErpRoWMWcMmfHu
+            W2kPu6dx+P4kxTeVHFZ1lcIzFAiVqFr4JwNjceCRgY4Aw/A6i3LNvmVnsWfjPgesFbZGQ
+            OTxrCZMnb//01uUuLO+bSPP3Ez1LMNAyNAKg0u5kOWhB6LM1Xz6M6tU6yafecv18FhdZt
+            m9zlHIJaedq8W/9HBHooauYxm+pSesHOA81oBDExBUQ/Vy04nPg9NGfh45ykItprO8+Ck
+            fH1HitSy+29m4veX8r3z8YH+4R+qqV3Awqvn7IvMBYby0qztXHtN2BwglCq/tjtTOadEs
+            bwUAug5sgYg1FXGItYUB2nK1tKTKZjwU/EKIhHO5DvB/HCOT8eklAiCLPGUzeSIkJ51tB
+            lZBub4uG40DmnnJ7Z9BZUXafHiKD9DI1FOyV32cJ/fg86MXLei+AYSYv5d1tn8=
+        api_token: !encrypted/pkcs1-oaep
+          - axhWeseluuvfxpShTONWAmxrokDi4WOZEOnTWcFxaEcLJrokurDPDNjZGbcCw1ExsMVzp
+            N1y0NVpsykc6aVEHyHXlKV6uopISaDDJqdBwFsETP77x28cRa74aZ+0o3iaeiXwHSGzUd
+            mIfoQe/X98xP98+DAtJ8fPyw10CYZu4hbRaTLWMUySM7ArKTgGoOqAP/vOLabQT6ax5zV
+            VKmC3UFopyyf/vPOja4l5qrFBCbn0y2jad7mPjAqUkNMWwkdzRShdd6qKb9pAPyHSyLXI
+            5lBzwDVishB0r/o37iu2z+Zb5HCfbyBKu0YfKRYxm30QptaIbp+wD3n9n8htxYM++7WpQ
+            9X6ZdRvZa7GyZFNkUU+8HU0cGhWgXQmoQoBIB+8aZ7Qxsw2xGO8EWKattNAH2hol3b3AP
+            damZw3y7RLqjlyTuzIPGT6cgyzIkWpiYzPnQ8vrHjE1wghrmPO9wMBOeSin7v4ldF61NQ
+            DsPW6uMLh3rHcrRmQXl9TbdM3TGRLAQIfDNMy4KDLUe7rIcgfvwxOgdSxOfxydSEb2oDU
+            ZUUa9IZry1ZMf2THdPR16wGvfdU3ek4nmT+/js8zrf7LFig5YW1pI5qMq5V2rh5RhRHGu
+            r4ceTYNwEYf7Tr3BfXa/S7VbdibLwkMlyGUzwgrBreDsiu36swNp7x8bqzdT44=
 
 - job:
     name: zuul-storage-proxy-build-image
-    description: Build and test a Docker image.
-    parent: opendev-build-docker-image
+    description: Build and test a container image.
+    parent: opendev-build-container-image
     allowed-projects: zuul/zuul-storage-proxy
     provides: zuul-storage-proxy-container-image
     run: &image_playbooks
       - playbooks/build.yaml
       - playbooks/test.yaml
     vars: &image_vars
-      docker_images:
+      promote_container_image_method: intermediate-registry
+      promote_container_image_job: zuul-storage-proxy-upload-image
+      container_command: docker
+      container_images:
         - context: .
-          repository: zuul/zuul-storage-proxy
+          registry: quay.io
+          repository: quay.io/zuul-ci/zuul-storage-proxy
           target: zuul-storage-proxy
           tags:
             # If zuul.tag is defined: [ '3', '3.19', '3.19.0' ].  Only works for 3-component tags.
@@ -35,25 +51,25 @@
 
 - job:
     name: zuul-storage-proxy-upload-image
-    parent: opendev-upload-docker-image
-    description: Build and test a Docker image and upload to Docker Hub.
+    parent: opendev-upload-container-image
+    description: Build and test a container image.
     allowed-projects: zuul/zuul-storage-proxy
     run: *image_playbooks
     secrets:
-      name: docker_credentials
-      secret: zuul-storage-proxy-dockerhub
+      name: container_registry_credentials
+      secret: zuul-storage-proxy-registry-credentials
       pass-to-parent: true
     provides: zuul-storage-proxy-container-image
     vars: *image_vars
 
 - job:
     name: zuul-storage-proxy-promote-image
-    parent: opendev-promote-docker-image
-    description: Promote previously uploaded Docker image.
+    parent: opendev-promote-container-image
+    description: Promote previously uploaded container image.
     allowed-projects: zuul/zuul-storage-proxy
     secrets:
-      name: docker_credentials
-      secret: zuul-storage-proxy-dockerhub
+      name: container_registry_credentials
+      secret: zuul-storage-proxy-registry-credentials
       pass-to-parent: true
     nodeset:
       nodes: []
@@ -80,11 +96,11 @@
     release:
       jobs:
         - zuul-release-python
-        - upload-docker-image:
+        - upload-container-image:
             secrets:
-              name: docker_credentials
-              secret: zuul-storage-proxy-dockerhub
+              name: container_registry_credentials
+              secret: zuul-storage-proxy-registry-credentials
               pass-to-parent: true
             vars:
               <<: *image_vars
-              upload_docker_image_promote: false
+              upload_container_image_promote: false
diff --git a/playbooks/build.yaml b/playbooks/build.yaml
index 8239eed..c2d40d3 100644
--- a/playbooks/build.yaml
+++ b/playbooks/build.yaml
@@ -1,6 +1,6 @@
 - hosts: all
   roles:
-    - build-docker-image
+    - build-container-image
 
 # If buildset_registry is defined, that means a parent job is running it;
 # only if it is not defined does it mean that we are running it.  If we
diff --git a/playbooks/test.yaml b/playbooks/test.yaml
index 7a06e52..0afb25c 100644
--- a/playbooks/test.yaml
+++ b/playbooks/test.yaml
@@ -1,7 +1,7 @@
 - hosts: all
   vars:
     content: "Hello world!"
-    proxy_image: docker.io/zuul/zuul-storage-proxy:latest
+    proxy_image: quay.io/zuul-ci/zuul-storage-proxy:latest
   tasks:
     - name: Create clouds.yaml
       tempfile: