diff --git a/playbooks/test-bifrost-dhcp.yaml b/playbooks/test-bifrost-dhcp.yaml
index ca94a7c29..4394a5a21 100644
--- a/playbooks/test-bifrost-dhcp.yaml
+++ b/playbooks/test-bifrost-dhcp.yaml
@@ -86,21 +86,22 @@
     - role: ironic-enroll-dynamic
     - { role: ironic-inspect-node, when: inspect_nodes | default('false') | bool == true }
 - hosts: baremetal
-  name: "Create configuration drive files."
+  name: "Create configuration drive files and deploy machines"
+  vars:
+    inventory_dhcp_static_ip: "{{ inventory_dhcp_static_ip | bool == true }}"
   become: no
   connection: local
   roles:
     - role: bifrost-configdrives-dynamic
+    - role: bifrost-deploy-nodes-dynamic
 - hosts: baremetal
   vars:
-    inventory_dhcp_static_ip: "{{ inventory_dhcp_static_ip | bool == true }}"
     multinode_testing: true
-  name: "Deploy machines."
+  name: "Prepare for deployment verification"
   become: no
   connection: local
   serial: 1
   roles:
-    - role: bifrost-deploy-nodes-dynamic
     - role: bifrost-prepare-for-test-dynamic
 # The testvm Host group is added by bifrost-prepare-for-test based
 # on the contents of the CSV file.
diff --git a/playbooks/test-bifrost-dynamic.yaml b/playbooks/test-bifrost-dynamic.yaml
index b4c39e54b..096b9fec0 100644
--- a/playbooks/test-bifrost-dynamic.yaml
+++ b/playbooks/test-bifrost-dynamic.yaml
@@ -74,18 +74,18 @@
     - role: ironic-enroll-dynamic
     - { role: ironic-inspect-node, when: inspect_nodes | default('false') | bool == true }
 - hosts: baremetal
-  name: "Create configuration drive files."
+  name: "Create configuration drive files and deploy machines"
   become: no
   connection: local
   roles:
     - role: bifrost-configdrives-dynamic
+    - role: bifrost-deploy-nodes-dynamic
 - hosts: baremetal
-  name: "Deploy machines."
+  name: "Prepare for deployment verification"
   become: no
   connection: local
   serial: 1
   roles:
-    - role: bifrost-deploy-nodes-dynamic
     - role: bifrost-prepare-for-test-dynamic
 # The testvm Host group is added by bifrost-prepare-for-test based
 # on the contents of the CSV file.
diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml
index e382a4ae3..a91348270 100644
--- a/playbooks/test-bifrost.yaml
+++ b/playbooks/test-bifrost.yaml
@@ -88,21 +88,21 @@
     - { role: ironic-inspect-node, when: inspect_nodes | default('false') | bool == true }
 
 - hosts: baremetal
-  name: "Create configuration drive files."
+  name: "Create configuration drive files and deploy machines"
+  vars:
+    multinode_testing: "{{ inventory_dhcp | bool == true }}"
   become: no
   connection: local
   roles:
     - role: bifrost-configdrives-dynamic
+    - role: bifrost-deploy-nodes-dynamic
 
 - hosts: baremetal
-  vars:
-    multinode_testing: "{{ inventory_dhcp | bool == true }}"
-  name: "Deploy machines."
+  name: "Prepare for deployment verification"
   become: no
   connection: local
   serial: 1
   roles:
-    - role: bifrost-deploy-nodes-dynamic
     - role: bifrost-prepare-for-test-dynamic
 
 # The testvm Host group is added by bifrost-prepare-for-test based