diff --git a/ci_framework/roles/edpm_deploy_baremetal/tasks/main.yml b/ci_framework/roles/edpm_deploy_baremetal/tasks/main.yml
index 67749f9eb7..a38478b2cd 100644
--- a/ci_framework/roles/edpm_deploy_baremetal/tasks/main.yml
+++ b/ci_framework/roles/edpm_deploy_baremetal/tasks/main.yml
@@ -44,14 +44,23 @@
   ansible.builtin.include_role:
     name: set_openstack_containers
 
-- name: Install Dataplane with baremetal
+- name: Create virtual baremetal
   vars:
-    make_edpm_baremetal_env: "{{ cifmw_edpm_deploy_baremetal_common_env |
+    make_edpm_baremetal_compute_env: "{{ cifmw_edpm_deploy_baremetal_common_env |
       combine(cifmw_edpm_deploy_baremetal_make_openstack_env | from_yaml)}}"
-    make_edpm_baremetal_dryrun: "{{ cifmw_edpm_deploy_baremetal_dry_run }}"
+    make_edpm_baremetal_compute_dryrun: "{{ cifmw_edpm_deploy_baremetal_dry_run }}"
   ansible.builtin.include_role:
     name: 'install_yamls_makes'
-    tasks_from: 'make_edpm_baremetal'
+    tasks_from: 'make_edpm_baremetal_compute'
+
+- name: Deploy EDPM with baremetal
+  vars:
+    make_edpm_deploy_baremetal_env: "{{ cifmw_edpm_deploy_baremetal_common_env |
+      combine(cifmw_edpm_deploy_baremetal_make_openstack_env | from_yaml)}}"
+    make_edpm_deploy_baremetal_dryrun: "{{ cifmw_edpm_deploy_baremetal_dry_run }}"
+  ansible.builtin.include_role:
+    name: 'install_yamls_makes'
+    tasks_from: 'make_edpm_deploy_baremetal'
 
 - name: Wait for Ironic to be ready
   when: not cifmw_edpm_deploy_baremetal_dry_run