diff --git a/zuul.d/legacy-bifrost-jobs.yaml b/zuul.d/legacy-bifrost-jobs.yaml
index e43c0d50f..1da46961a 100644
--- a/zuul.d/legacy-bifrost-jobs.yaml
+++ b/zuul.d/legacy-bifrost-jobs.yaml
@@ -1,8 +1,8 @@
 - job:
     name: bifrost-integration-dhcp
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-dhcp/run
-    post-run: playbooks/legacy/bifrost-integration-dhcp/post
+    run: playbooks/legacy/bifrost-integration-dhcp/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-dhcp/post.yaml
     timeout: 7200
     required-projects:
       - openstack/bifrost
@@ -17,8 +17,8 @@
 - job:
     name: bifrost-integration-dhcp-centos-7
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-dhcp-centos-7/run
-    post-run: playbooks/legacy/bifrost-integration-dhcp-centos-7/post
+    run: playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml
     timeout: 7200
     nodeset: legacy-centos-7
     required-projects:
@@ -34,8 +34,8 @@
 - job:
     name: bifrost-integration-dhcp-opensuse-423
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run
-    post-run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post
+    run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml
     timeout: 7200
     nodeset: legacy-opensuse-423
     required-projects:
@@ -51,8 +51,8 @@
 - job:
     name: bifrost-integration-dibipa-debian
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-dibipa-debian/run
-    post-run: playbooks/legacy/bifrost-integration-dibipa-debian/post
+    run: playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-dibipa-debian/post.yaml
     timeout: 7200
     required-projects:
       - openstack/bifrost
@@ -67,8 +67,8 @@
 - job:
     name: bifrost-integration-dibipa-debian-centos-7
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/run
-    post-run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/post
+    run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/post.yaml
     timeout: 7200
     nodeset: legacy-centos-7
     required-projects:
@@ -84,8 +84,8 @@
 - job:
     name: bifrost-integration-dibipa-debian-opensuse-423
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/run
-    post-run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/post
+    run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/post.yaml
     timeout: 7200
     nodeset: legacy-opensuse-423
     required-projects:
@@ -101,8 +101,8 @@
 - job:
     name: bifrost-integration-tinyipa
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-tinyipa/run
-    post-run: playbooks/legacy/bifrost-integration-tinyipa/post
+    run: playbooks/legacy/bifrost-integration-tinyipa/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-tinyipa/post.yaml
     timeout: 3600
     required-projects:
       - openstack/bifrost
@@ -116,8 +116,8 @@
 - job:
     name: bifrost-integration-tinyipa-centos-7
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/run
-    post-run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/post
+    run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/post.yaml
     timeout: 3600
     nodeset: legacy-centos-7
     required-projects:
@@ -132,8 +132,8 @@
 - job:
     name: bifrost-integration-tinyipa-opensuse-423
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/run
-    post-run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/post
+    run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/post.yaml
     timeout: 3600
     nodeset: legacy-opensuse-423
     required-projects: