diff --git a/.gitignore b/.gitignore
index dcc39b317a..5234b3e880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,9 @@ trove.iml
 .pid
 .stestr/
 
+# Files generated by JetBrains
+.idea/
+
 # Sphinx
 doc/build/*
 doc/source/api/*
diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu
index eef67356de..fa12027841 100644
--- a/integration/scripts/functions_qemu
+++ b/integration/scripts/functions_qemu
@@ -59,7 +59,7 @@ function build_guest_image() {
         elementes="$elementes ubuntu-minimal"
     fi
 
-    export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"ConfigDrive"}
+    export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"ConfigDrive, OpenStack"}
     elementes="$elementes cloud-init-datasources"
 
     elementes="$elementes pip-cache"
diff --git a/.zuul.yaml b/zuul.d/jobs.yaml
similarity index 90%
rename from .zuul.yaml
rename to zuul.d/jobs.yaml
index 5df9297112..2decd52695 100644
--- a/.zuul.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,53 +1,3 @@
-- nodeset:
-    name: trove-ubuntu-focal
-    nodes:
-      - name: controller
-        label: nested-virt-ubuntu-focal
-    groups:
-      - name: tempest
-        nodes:
-          - controller
-
-- project:
-    templates:
-      - check-requirements
-      - openstack-cover-jobs
-      # - openstack-lower-constraints-jobs
-      - openstack-python3-zed-jobs
-      - periodic-stable-jobs
-      - publish-openstack-docs-pti
-      - release-notes-jobs-python3
-    check:
-      jobs:
-        - openstack-tox-cover:
-            voting: false
-        - trove-tox-bandit-baseline:
-            voting: false
-        - trove-tempest:
-            voting: false
-        - trove-tempest-postgres:
-            voting: false
-        - trove-tempest-ipv6-only:
-            voting: false
-        - trove-functional-mysql:
-            voting: false
-    gate:
-      queue: trove
-      jobs:
-        - trove-tempest:
-            voting: false
-    experimental:
-      jobs:
-        - trove-functional-mysql
-        - trove-scenario-mysql-single
-        - trove-scenario-mysql-multi
-        - trove-scenario-mariadb-single
-        - trove-scenario-mariadb-multi
-    periodic:
-      jobs:
-        - publish-trove-guest-image-ubuntu-bionic
-        - publish-trove-guest-image-ubuntu-bionic-dev
-
 - job:
     name: trove-devstack-base
     parent: devstack
@@ -460,6 +410,26 @@
       - openstack/trove
       - openstack/tripleo-image-elements
 
+- job:
+    name: trove-ubuntu-guest-image-build
+    run: playbooks/image-build/run.yaml
+    nodeset: trove-ubuntu-focal-single
+    description: |
+      Build Ubuntu Bionic based image only on ubuntu distro.
+    required-projects:
+      - openstack/diskimage-builder
+      - openstack/trove
+      - openstack/tripleo-image-elements
+    files:
+      - ^integration/(scripts|tests)/
+    vars:
+      guest_os: ubuntu
+      guest_os_release: bionic
+      guest_username: ubuntu
+      branch: master
+      dev_mode: false
+      image_suffix: ""
+
 - job:
     name: publish-trove-guest-image-ubuntu-bionic
     parent: publish-trove-guest-image
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
new file mode 100644
index 0000000000..88688f9c95
--- /dev/null
+++ b/zuul.d/nodesets.yaml
@@ -0,0 +1,15 @@
+- nodeset:
+    name: trove-ubuntu-focal
+    nodes:
+      - name: controller
+        label: nested-virt-ubuntu-focal
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
+- nodeset:
+    name: trove-ubuntu-focal-single
+    nodes:
+      - name: primary
+        label: ubuntu-focal
\ No newline at end of file
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
new file mode 100644
index 0000000000..0628d05140
--- /dev/null
+++ b/zuul.d/projects.yaml
@@ -0,0 +1,42 @@
+
+- project:
+    templates:
+      - check-requirements
+      - openstack-cover-jobs
+      # - openstack-lower-constraints-jobs
+      - openstack-python3-zed-jobs
+      - periodic-stable-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
+    check:
+      jobs:
+        - openstack-tox-cover:
+            voting: false
+        - trove-tox-bandit-baseline:
+            voting: false
+        - trove-tempest:
+            voting: false
+        - trove-ubuntu-guest-image-build:
+            voting: true
+        - trove-tempest-postgres:
+            voting: false
+        - trove-tempest-ipv6-only:
+            voting: false
+        - trove-functional-mysql:
+            voting: false
+    gate:
+      queue: trove
+      jobs:
+        - trove-tempest:
+            voting: false
+    experimental:
+      jobs:
+        - trove-functional-mysql
+        - trove-scenario-mysql-single
+        - trove-scenario-mysql-multi
+        - trove-scenario-mariadb-single
+        - trove-scenario-mariadb-multi
+    periodic:
+      jobs:
+        - publish-trove-guest-image-ubuntu-bionic
+        - publish-trove-guest-image-ubuntu-bionic-dev
\ No newline at end of file