diff --git a/.zuul.yaml b/.zuul.yaml
index 0c5d37de10..27775ae7de 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,5 @@
 - job:
+<<<<<<< HEAD   (d66759 Merge "Remove None valued network quota entries" into stable)
     name: osc-tox-unit-tips
     parent: openstack-tox
     description: |
@@ -61,6 +62,8 @@
       zuul_work_dir: src/opendev.org/openstack/python-openstackclient
 
 - job:
+=======
+>>>>>>> CHANGE (9fac39 [stable-only] CI: Drop all tips jobs)
     name: osc-functional-devstack-base
     parent: devstack-tox-functional
     description: |
@@ -141,6 +144,7 @@
         q-svc: false
       tox_envlist: functional
 
+<<<<<<< HEAD   (d66759 Merge "Remove None valued network quota entries" into stable)
 - job:
     name: osc-functional-devstack-tips
     parent: osc-functional-devstack
@@ -185,11 +189,69 @@
       jobs:
         - osc-tox-py27-tips
         - osc-tox-py36-tips
+=======
+- secret:
+    name: osc-dockerhub
+    data:
+      username: osclientzuul
+      password: !encrypted/pkcs1-oaep
+        - LbIZjJiVstRVXMpoLQ3+/JcNB6lKVUWJXXo5+Outf+PKAaO7mNnv8XLiFMKnJ6ftopLyu
+          hWbX9rA+NddvplLQkf1xxkh7QBBU8PToLr58quI2SENUclt4tpjxbZfZu451kFSNJvNvR
+          E58cHHpfJZpyRnS2htXmN/Qy24gbV2w7CQxSZD2YhlcrerD8uQ8rWEnlY1wcJEaEGomtS
+          ZTGxsdK2TsZC2cd4b7TG7+xbl2i+hjADzwSQAgUzlLlwuG71667+IWk4SOZ7OycJTv9NN
+          ZTak8+CGfiMKdmsxZ1Z8uD7DC+RIklDjMWyly6zuhWzfhOmsmU0CesR50moodRUvbK79p
+          NZM8u0hBex5cl2EpUEwJL/FSPJXUhDMPoMoTZT/SAuXf25R9eZ9JGrKsIAlmVhpl8ifoE
+          8TpPyvIHGS3YelTQjhqOX0wGb9T4ZauQCcI5Ajzy9NuCTyD9xxme9OX1zz7gMACRnVHvz
+          q7U7Ue90MnmGH6E2SgKjIZhyzy9Efwb7JUvH1Zb3hlrjCjEhwi9MV5FnABTEeXyYwE10s
+          3o/KZg2zvdWkVG6x0dEkjpoQaNuaB7T2Na7Sm421n/z3LCzhiQGuTUjENnL6cMEtuA6Pp
+          BfI5+Qlg7HMwkBXNB73EPfWHzbCR3VNrzGYTy9FvhGud0/cXsuBXgps4WH63ic=
+
+- job:
+    name: osc-build-image
+    parent: opendev-build-docker-image
+    description: Build Docker images.
+    allowed-projects: openstack/python-openstackclient
+    requires:
+      - python-builder-container-image
+      - python-base-container-image
+    provides: osc-container-image
+    vars: &osc_image_vars
+      docker_images:
+        - context: .
+          repository: osclient/python-openstackclient
+
+- job:
+    name: osc-upload-image
+    parent: opendev-upload-docker-image
+    description: Build Docker images and upload to Docker Hub.
+    allowed-projects: openstack/python-openstackclient
+    requires:
+      - python-builder-container-image
+      - python-base-container-image
+    provides: osc-container-image
+    secrets:
+      - name: docker_credentials
+        secret: osc-dockerhub
+        pass-to-parent: true
+    vars: *osc_image_vars
+
+- job:
+    name: osc-promote-image
+    parent: opendev-promote-docker-image
+    allowed-projects: openstack/python-openstackclient
+    description: Promote previously uploaded Docker images.
+    secrets:
+      - name: docker_credentials
+        secret: osc-dockerhub
+        pass-to-parent: true
+    nodeset:
+      nodes: []
+    vars: *osc_image_vars
+>>>>>>> CHANGE (9fac39 [stable-only] CI: Drop all tips jobs)
 
 - project:
     templates:
       - openstackclient-plugin-jobs
-      - osc-tox-unit-tips
       - openstack-cover-jobs
       - openstack-python-jobs
       - openstack-python3-train-jobs
@@ -207,10 +269,6 @@
         #     # should be disabled until the New Way of testing against old clouds
         #     # is ready and backported
         #     branches: ^(?!stable/(newton|ocata)).*$
-        - osc-functional-devstack-tips:
-            # The functional-tips job only tests the latest and shouldn't be run
-            # on the stable branches
-            branches: ^(?!stable)
     gate:
       jobs:
         - osc-functional-devstack