diff --git a/playbooks/zuul-migrate.yaml b/playbooks/zuul-migrate.yaml
deleted file mode 100644
index 2001982..0000000
--- a/playbooks/zuul-migrate.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- hosts: all
-  tasks:
-
-    - name: Install migration dependencies
-      command: "python3 -m pip install --user src/git.openstack.org/openstack-infra/zuul[migrate]"
-
-    - name: Migrate the data
-      command: "python3 ../zuul/zuul/cmd/migrate.py zuul/layout.yaml jenkins/jobs nodepool/nodepool.yaml . --mapping=zuul/mapping.yaml -v"
-      args:
-        chdir: src/git.openstack.org/openstack-infra/project-config
-
-    - name: Collect generated job config
-      synchronize:
-        dest: "{{ zuul.executor.log_root }}"
-        mode: pull
-        src: "src/git.openstack.org/openstack-infra/project-config/zuul.d"
-        verify_host: true
-      no_log: true
-
-    - name: Collect generated playbooks
-      synchronize:
-        dest: "{{ zuul.executor.log_root }}/playbooks"
-        mode: pull
-        src: "src/git.openstack.org/openstack-infra/project-config/playbooks/legacy"
-        verify_host: true
-      no_log: true
diff --git a/playbooks/zuul-migrate/post.yaml b/playbooks/zuul-migrate/post.yaml
new file mode 100644
index 0000000..2647b7d
--- /dev/null
+++ b/playbooks/zuul-migrate/post.yaml
@@ -0,0 +1,26 @@
+- hosts: all
+  tasks:
+
+    - name: Collect openstack-zuul-jobs generated job config
+      synchronize:
+        dest: "{{ zuul.executor.log_root }}/openstack-zuul-jobs"
+        mode: pull
+        src: "src/git.openstack.org/openstack-infra/openstack-zuul-jobs/zuul.d"
+        verify_host: true
+      no_log: true
+
+    - name: Collect project generated job config
+      synchronize:
+        dest: "{{ zuul.executor.log_root }}/openstack-zuul-jobs"
+        mode: pull
+        src: "src/git.openstack.org/openstack-infra/project-config/zuul.d"
+        verify_host: true
+      no_log: true
+
+    - name: Collect generated playbooks
+      synchronize:
+        dest: "{{ zuul.executor.log_root }}/playbooks"
+        mode: pull
+        src: "src/git.openstack.org/openstack-infra/openstack-zuul-jobs/playbooks/legacy"
+        verify_host: true
+      no_log: true
diff --git a/playbooks/zuul-migrate/run.yaml b/playbooks/zuul-migrate/run.yaml
new file mode 100644
index 0000000..2ba81d0
--- /dev/null
+++ b/playbooks/zuul-migrate/run.yaml
@@ -0,0 +1,10 @@
+- hosts: all
+  tasks:
+
+    - name: Install migration dependencies
+      command: "python3 -m pip install --user src/git.openstack.org/openstack-infra/zuul[migrate]"
+
+    - name: Migrate the data
+      command: tools/run-migration.sh -v --final
+      args:
+        chdir: src/git.openstack.org/openstack-infra/zuul