diff --git a/.zuul.yaml b/.zuul.yaml
index 469e8c3..1873cfc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,10 +9,26 @@
     required-projects:
       - zuul/zuul-operator
 
+- job:
+    description: |
+      Build's Zuul operator image taken from buildset registry
+    name: zuul-operator-build-image
+    parent: opendev-build-docker-image
+    allowed-projects: zuul/zuul-operator
+    vars:
+      zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/zuul-operator'].src_dir }}"
+      docker_images:
+        - context: .
+          dockerfile: build/Dockerfile
+          repository: zuul/zuul-operator
 - project:
     check:
       jobs:
-        - zuul-operator-functional-k8s
+        - zuul-operator-build-image
+        - zuul-operator-functional-k8s:
+            dependencies: zuul-operator-build-image
     gate:
       jobs:
-        - zuul-operator-functional-k8s
+        - zuul-operator-build-image
+        - zuul-operator-functional-k8s:
+            dependencies: zuul-operator-build-image
\ No newline at end of file
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
index 05f344a..e70456e 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -22,14 +22,12 @@ spec:
           - stdout
           # TODO: use a public name
           image: "zuul/zuul-operator"
-          imagePullPolicy: "Never"
           volumeMounts:
           - mountPath: /tmp/ansible-operator/runner
             name: runner
             readOnly: true
         - name: operator
           image: "zuul/zuul-operator"
-          imagePullPolicy: "Never"
           volumeMounts:
           - mountPath: /tmp/ansible-operator/runner
             name: runner
diff --git a/playbooks/zuul-operator-functional-k8s/pre.yaml b/playbooks/zuul-operator-functional-k8s/pre.yaml
index 6b4b877..181cc06 100644
--- a/playbooks/zuul-operator-functional-k8s/pre.yaml
+++ b/playbooks/zuul-operator-functional-k8s/pre.yaml
@@ -5,4 +5,6 @@
     - role: bindep
     - role: clear-firewall
     - role: install-kubernetes
+    - role: use-buildset-registry
+      buildset_registry_docker_user: root
       docker_version: 18.06.1~ce~3-0~ubuntu
\ No newline at end of file
diff --git a/playbooks/zuul-operator-functional-k8s/run.yaml b/playbooks/zuul-operator-functional-k8s/run.yaml
index 7e0debb..7fef172 100644
--- a/playbooks/zuul-operator-functional-k8s/run.yaml
+++ b/playbooks/zuul-operator-functional-k8s/run.yaml
@@ -6,11 +6,6 @@
       set_fact:
         RELEASE_VERSION: v0.8.1
 
-    - name: Build operator
-      command: docker build -f build/Dockerfile -t zuul/zuul-operator .
-      args:
-        chdir: "{{ zuul.projects['opendev.org/zuul/zuul-operator'].src_dir }}"
-
     - name: Setup CRD
       command: kubectl create -f deploy/crds/zuul-ci_v1alpha1_zuul_crd.yaml
       args: