diff --git a/.zuul.yaml b/.zuul.yaml
index ee451bd..b99e1f8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,44 +1,60 @@
 # Image building jobs
 - secret:
-    name: zuul-preview-dockerhub
+    name: zuul-preview-registry-credentials
     data:
-      username: zuulzuul
-      password: !encrypted/pkcs1-oaep
-        - LZGNolqf2Y54m56CnmrAFZeAnQie0RZ3nBRtX1zqr8PUpZZRrACwVck0Nec8w9rmkCMiA
-          ic4Sm5b9kzAPT60sZ0G0R2SeZzE3g2HxMdDyzyjcpY+8xliU4BuR+RUOg12WuA1ivZb5g
-          JJP2N/hoYydBrVW1em7oChhhhoTEtSgf7FgQMWB5O/WsZ/8ukrOCo1Wwb5+9q7BolEHtW
-          KfHpTWv0PkAjJlQW36WZYi4Pgo84gd+H1RXx1/KzeUhuV+iINeroTrlP4cf2fSoOEjnoT
-          jLhIBa8d3ep6URdXexNfAr0bQoz36xocmy8bu6PYTJbS1lcTsKEvNe0I7hyNHV/HwKwRr
-          4CCsHjqMSdN/hSbmpkFjQsJOgjHMFYwt7QuFlGkY3MT0/WUAPmx0gGF/XJfFMwqUdxk7g
-          GqMYee2MHohDkHF6O4CVmoAJGGZ1hRD9BfdXeCbYyETu+6rTlyXcbViPM2Tu9NFVcCQDJ
-          SuFy5Lmts5huiZWiVzL87Ql5AxcgM49WuA3FDnLKZV3KH78VmWJOudNnMttxg/29E40+J
-          hNjvRuhawyXarlarURPESEXRT49E4ywDuAE6MqJGDiWXdqv5LrHep1iAdyFd/1J/KD82T
-          nadoBxpFGzzkcVV+H3EnfMQmUJ8UMA6YmF1jx5XpIR0Wj7j+OhbJTCMCruG6Xs=
+      quay.io:
+        username: zuul-ci+opendevzuul
+        password: !encrypted/pkcs1-oaep
+          - 2xxFyprdLABgYC7Qx/Lc8UTJalDlkpMItJqisbkcQMj5JB8dVbdvqbkpwx7yUjm0o2iUc
+            83DqgylbvgptBKsWutTVWnAySO+9+VpFuMZaE2tyQz/cjH6BKjt2YwPYUQ7gBYKmAFJLj
+            uCioGTr6nGKbZUlHQcBIvt7N3q2vz6/T4MciU7jjqmZuzZdq5BH6m2ruVHtayQ3O1AAJn
+            AhTotf/Kn6kBmxcZwHIIHYA3gLZTf1WQZlRI2e4zEb4qsCEN7ljw+QKq1OHGpBKf5cwXR
+            gD494ahMrar6oNuS2rmQZPtttC2WV/FFzybrL1jSJLqbCaYSb4CvXNXZLuwPOGqWTofiZ
+            r+ln84CmP7pkTbri1OTtvEVigsrrxzAhN1tIsVvO83mTxKcbr1MbybAZII5ytQdqyiCKn
+            Io0FeW9o0mNa3ck2D7NxKoo65UEZ8Kg7ZAWlD9d6FSBqnDst26UXx1/hUDrOcLpexMzf4
+            sFUQ3Ea1/0d5UkOYAOrsTMNclMmRJbk8S8NTVRW8ic8UjjjJ0kadRI0kIQRKlB7DYLkKO
+            1qUzAYcTdDsu+xVI3/no5i8JyNIPZq3dESr7GYKuEQqsH2rz70z0nL4tXhTJg7S9m3bVQ
+            WxU2JFKNeK0oitS2eByIXLRXTjhydlfNwgdiz3xbUf4CsaVOAGZpJqXeINGXW8=
+        api_token: !encrypted/pkcs1-oaep
+          - r0OacqPedr6HRk4bJAqP55SFmRwZzBEuQqsr9CJHA9id4OxItz2fwZgq/AoJgpw/4rdHI
+            NMne7A187vxZvfMJC74iBv5KVCgviz42Q+Qolwg2AQSWEI8I2jp2H64M6FDOZ0igPMZ5S
+            K3NEi8Ax7i0hOSgF//rSteiC7vTS1SFB3f6B0dR8tY59zu44ykmu2YLfxSDwSo+2Ciqnv
+            xM4hqeu0caOzUWjSDY+PLmeqVR/99n2ffWA5ouSjbMzS1zWH3PcPLkdPPDIrVLG4+RY/K
+            BivZh6nU/rnUynLaBRETU1Q33mN89sKEmEbxdNoFbXa3Htq92pSyCco3rxyyiEPNddlhZ
+            1psjO4ChMbTl38zGiUr2OaopIwrWeHja10nvXTSuqkkwyGgdmfK3d9DkivHV136hi+2s2
+            I6YANwjpQCE0sh04lpGK4brW5/AP3qWYbpU2S3IbHk6yMwpq/ngP4bHtbJMJlrogYn6yk
+            QS7baBWxmMdrzNO7fHyxNWFpB1Id+SM6ZhQ72iLiMzLvRxUehZKPbsbRxT/Lnng91Tzy7
+            7STwD9ALyj1vnM7kXkokGUqC8D+eADGkneoRjQvs7zDaEQXgEKGUgcgMQz8duDLTs41d3
+            wQSMDXFhKl3aiZCNSMv3SbBFRMyK5pEhKLkz9jmVWWFfBvm9wJxk66uXAMPVV8=
 
 - job:
     name: zuul-preview-build-image
-    parent: opendev-build-docker-image
+    parent: opendev-build-container-image
     vars: &zuul_preview_image_vars
-      docker_images:
+      promote_container_image_method: intermediate-registry
+      promote_container_image_job: zuul-preview-upload-image
+      container_command: docker
+      container_images:
         - context: .
-          repository: zuul/zuul-preview
+          registry: quay.io
+          repository: quay.io/zuul-ci/zuul-preview
 
 - job:
     name: zuul-preview-upload-image
-    parent: opendev-upload-docker-image
+    parent: opendev-upload-container-image
     vars: *zuul_preview_image_vars
     secrets:
-      name: docker_credentials
-      secret: zuul-preview-dockerhub
+      name: container_registry_credentials
+      secret: zuul-preview-registry-credentials
       pass-to-parent: true
 
 - job:
     name: zuul-preview-promote-image
-    parent: opendev-promote-docker-image
+    parent: opendev-promote-container-image
     vars: *zuul_preview_image_vars
     secrets:
-      name: docker_credentials
-      secret: zuul-preview-dockerhub
+      name: container_registry_credentials
+      secret: zuul-preview-registry-credentials
       pass-to-parent: true
 
 - project: