diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
index 18e907ed0..81df5a969 100644
--- a/zuul.d/ironic-python-agent-jobs.yaml
+++ b/zuul.d/ironic-python-agent-jobs.yaml
@@ -15,6 +15,7 @@
     vars:
       devstack_localrc:
         IRONIC_BUILD_DEPLOY_RAMDISK: True
+        IRONIC_VM_COUNT: 2
 
 - job:
     name: ipa-tempest-wholedisk-bios-ipmi-direct-dib-src
@@ -198,3 +199,12 @@
       devstack_localrc:
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_VM_SPECS_RAM: 384
+
+# Cloning the jobs so we can update ipa-builder and then we can the old jobs.
+- job:
+    name: ipa-tempest-bios-ipmi-direct-tinyipa-src
+    parent: ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
+
+- job:
+    name: ipa-tempest-bios-ipmi-iscsi-tinyipa-src
+    parent: ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7674fbe8a..62156e358 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,10 +8,10 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
+        # NOTE(iurygregory) Only run this two jobs since we are testing
+        # wholedisk + partition on tempest
+        - ipa-tempest-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-bios-ipmi-iscsi-tinyipa-src
         - ironic-standalone-ipa-src
         - metalsmith-integration-ipa-src
         # NOTE(dtantsur): non-voting because IPA source code is very unlikely
@@ -30,10 +30,8 @@
     gate:
       queue: ironic
       jobs:
-        - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
+        - ipa-tempest-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-bios-ipmi-iscsi-tinyipa-src
         - ironic-standalone-ipa-src
         - metalsmith-integration-ipa-src
     experimental: