diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
index 4d3de1852..05c8116b9 100644
--- a/zuul.d/ironic-python-agent-jobs.yaml
+++ b/zuul.d/ironic-python-agent-jobs.yaml
@@ -137,10 +137,22 @@
         # excluding it from the enabled list to save gate time.
         IRONIC_ENABLED_DEPLOY_INTERFACES: "direct"
 
-# This job will superceed the above centos7 metalsmith integration job
 - job:
     name: metalsmith-integration-ipa-src-uefi
-    parent: metalsmith-integration-glance-localboot-centos8-uefi
+    parent: metalsmith-integration-glance-centos8-uefi
+    required-projects:
+      - openstack/ironic-python-agent
+      - openstack/ironic-python-agent-builder
+      - openstack/ironic-lib
+    vars:
+      devstack_localrc:
+        # Don't waste time on cleaning, it's checked everywhere else
+        IRONIC_AUTOMATED_CLEAN_ENABLED: False
+        IRONIC_BUILD_DEPLOY_RAMDISK: True
+
+- job:
+    name: metalsmith-integration-ipa-src-legacy
+    parent: metalsmith-integration-glance-centos8-legacy
     required-projects:
       - openstack/ironic-python-agent
       - openstack/ironic-python-agent-builder
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 926baf85d..429641c6a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,6 +14,7 @@
         - ipa-tempest-bios-ipmi-direct-src
         - ipa-tempest-uefi-redfish-vmedia-src
         - metalsmith-integration-ipa-src-uefi
+        - metalsmith-integration-ipa-src-legacy
         - ironic-standalone-ipa-src
         # NOTE(dtantsur): non-voting because IPA source code is very unlikely
         # to break them. They rather serve as a canary for broken POST jobs.
@@ -33,6 +34,7 @@
         - ipa-tempest-bios-ipmi-direct-src
         - ipa-tempest-uefi-redfish-vmedia-src
         - metalsmith-integration-ipa-src-uefi
+        - metalsmith-integration-ipa-src-legacy
         - ironic-standalone-ipa-src
     post:
       jobs: