diff --git a/.zuul.yaml b/.zuul.yaml
index b241f1f..4c117a2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -14,10 +14,27 @@
           /ZjKtC+ftXNtvtFxcsxKYD/VqFZGgc4ZtHJV1OE+2bOj436AUo3doYjrkwitX4IfZQNEs
           PdwF2MW3w/xLLbl+jQqM6tp/1snbuRK/l1rP8XFCQUlb2sZE3oCAJJNAsQNPFY=
 
+- secret:
+    name: zuul-client-registry-credentials
+    data:
+      quay.io:
+        username: zuul-ci+opendevzuul
+        password: !encrypted/pkcs1-oaep
+          - GX8hh/xfQU8kvjbyXXtkSoFjgdV4ElWHPhWcFg5IOTD1uNdRK6taeM7mSpK/A72nSWrna
+            Ux92/67XGUbw5vHFVdaLEAc8QwEFewUSowQf6UMDd4aUmH/15HHCKL8JiGfAfnbmlFyX+
+            4xH9tAHT+3oK4uca9C9Fx+pNsYRm/2d/kYO4k4KKw4azf1ALMHUqrkHT4CZyaVICoqsfG
+            23EryqP0JsGZrFNccCGCxlzmNVR6JZi6y62udOjm/JnU8+JZwgQl6UbBj8wyK/dYN/XUF
+            dBn0LZBzTP5r+qU9Tb8181SNKl7MqhrNt7xBfCSyn9qef66G8SKdjtO8YSF1+5dbrI7GJ
+            Axmgj2GyAFUTnp630QMch/zquuDKmEeFZRkVr7+Gwwd0WRRJRc519+rzbD0+vLAgfqQ2Z
+            x8lK5+zQMsPWDyh4l98j75gTMMOcfC0s1eDlXeHfkIqd9GK0WA/RCen8u+JcR/dB3mbxH
+            mq4UKERj9Tlz6IlXI2N0/Pfs/9eIJH6kZwRr9F2PDxWEW/5M4KRs3BvyOPf0TNIdFxOgy
+            MLkNzgHuRRDzPb6aBq1rzmZs7aHVXKeI9RTS34HnOml/LKvkvP3CuqmK1HGBWqiMSh/y3
+            M127RdfowOpcXKGuXm/jC0QD8vmefX+H2h4yMU20N9t9IMZ9A+vNUa9Zp0vgzE=
+
 - job:
     name: zuul-client-build-image
-    parent: opendev-build-docker-image
-    description: Build a Docker image for the CLI.
+    parent: opendev-build-container-image
+    description: Build a container image for the CLI.
     allowed-projects: zuul/zuul-client
     timeout: 2700
     requires:
@@ -26,16 +43,18 @@
     provides:
       - zuul-client-container-image
     vars: &zuulclient_image_vars
-      docker_images:
+      container_command: docker
+      container_images:
         - context: .
-          repository: zuul/zuul-client
+          registry: quay.io
+          repository: quay.io/zuul-ci/zuul-client
           tags:
             &imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}"
 
 - job:
     name: zuul-client-upload-image
-    parent: opendev-upload-docker-image
-    description: Build the CLI Docker image and upload to Docker Hub.
+    parent: opendev-upload-container-image
+    description: Build the CLI container image and upload to the registry.
     timeout: 3600
     requires:
       - python-builder-3.10-bullseye-container-image
@@ -43,18 +62,18 @@
     provides: zuul-client-container-image
     vars: *zuulclient_image_vars
     secrets:
-      - name: docker_credentials
-        secret: zuul-client-dockerhub
+      - name: container_registry_credentials
+        secret: zuul-client-registry-credentials
         pass-to-parent: true
 
 - job:
     name: zuul-client-promote-image
-    parent: opendev-promote-docker-image
-    description: Promote previously uploaded Docker image.
+    parent: opendev-promote-container-image
+    description: Promote previously uploaded container image.
     vars: *zuulclient_image_vars
     secrets:
-      - name: docker_credentials
-        secret: zuul-client-dockerhub
+      - name: container_registry_credentials
+        secret: zuul-client-registry-credentials
         pass-to-parent: true
 
 - project:
@@ -100,11 +119,11 @@
       jobs:
         - opendev-release-python
         - zuul-publish-nox-docs
-        - upload-docker-image:
+        - upload-container-image:
             secrets:
-              name: docker_credentials
-              secret: zuul-client-dockerhub
-              pass-to-parent: true
+              - name: container_registry_credentials
+                secret: zuul-client-registry-credentials
+                pass-to-parent: true
             vars:
               <<: *zuulclient_image_vars
-              upload_docker_image_promote: false
+              upload_container_image_promote: false