diff --git a/roles/edpm_iscsid/tasks/run.yml b/roles/edpm_iscsid/tasks/run.yml
index 4ad60cbe1..c4df9cdbc 100644
--- a/roles/edpm_iscsid/tasks/run.yml
+++ b/roles/edpm_iscsid/tasks/run.yml
@@ -24,15 +24,12 @@
     file: healthchecks.yml
 
 - name: Manage iscsid containers
-  ansible.builtin.include_role:
-    name: edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: iscsid
-    edpm_container_standalone_container_defs:
-      iscsid: "{{ lookup('template', 'iscsid.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      iscsid: "{{ lookup('file', 'files/iscsid.yaml') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@iscsid
+    enabled: true
+    state: started
   register: manage_iscsid_stat
+  become: true
 
 - name: Check if the iscsid container restart is required
   ansible.builtin.stat:
@@ -52,7 +49,7 @@
     - not manage_iscsid_stat.changed|bool
     - iscsi_restart_stat.stat.exists|bool
   ansible.builtin.systemd:
-    name: edpm_iscsid
+    name: edpm-compute@iscsid
     state: restarted
 
 - name: Remove iscsid container restart sentinel file
diff --git a/roles/edpm_multipathd/tasks/install.yml b/roles/edpm_multipathd/tasks/install.yml
index 6ccca3698..e209c8bc8 100644
--- a/roles/edpm_multipathd/tasks/install.yml
+++ b/roles/edpm_multipathd/tasks/install.yml
@@ -41,7 +41,7 @@
         - ansible_facts.services["multipathd"]["status"] == "enabled"
       failed_when: false
       loop:
-        - multipathd.service
+        - edpm-compute@multipathd.service
         - multipathd.socket
       loop_control:
         index_var: multipath_service_index
diff --git a/roles/edpm_multipathd/tasks/run.yml b/roles/edpm_multipathd/tasks/run.yml
index 42988f15a..39e0fd5dd 100644
--- a/roles/edpm_multipathd/tasks/run.yml
+++ b/roles/edpm_multipathd/tasks/run.yml
@@ -24,14 +24,10 @@
     file: healthchecks.yml
 
 - name: Manage multipathd containers
-  ansible.builtin.include_role:
-    name: edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: multipathd
-    edpm_container_standalone_container_defs:
-      multipathd: "{{ lookup('template', 'multipathd.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      multipathd: "{{ lookup('template', 'kolla_multipathd.yaml.j2') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@multipathd
+    enabled: true
+    state: started
   register: manage_multipathd_stat
 
 - name: Check if the multipathd container restart is required
diff --git a/roles/edpm_neutron_metadata/tasks/run.yml b/roles/edpm_neutron_metadata/tasks/run.yml
index bc46b251d..01c93168e 100644
--- a/roles/edpm_neutron_metadata/tasks/run.yml
+++ b/roles/edpm_neutron_metadata/tasks/run.yml
@@ -37,11 +37,8 @@
     file: healthchecks.yml
 
 - name: Run ovn_metadata_agent container
-  ansible.builtin.include_role:
-    name: osp.edpm.edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: ovn_metadata_agent
-    edpm_container_standalone_container_defs:
-      ovn_metadata_agent: "{{ lookup('template', 'ovn_metadata_agent.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      ovn_metadata_agent: "{{ lookup('template', 'kolla_ovn_metadata_agent.yaml.j2') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@ovn_metadata_agent
+    enabled: true
+    state: started
+  become: true
diff --git a/roles/edpm_ovn/tasks/run.yml b/roles/edpm_ovn/tasks/run.yml
index 0a44bb24f..ee4008a3e 100644
--- a/roles/edpm_ovn/tasks/run.yml
+++ b/roles/edpm_ovn/tasks/run.yml
@@ -37,11 +37,9 @@
     file: healthchecks.yml
 
 - name: Run ovn_controller container
-  ansible.builtin.include_role:
-    name: osp.edpm.edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: edpm-compute@ovn_controller
-    edpm_container_standalone_container_defs:
-      ovn_controller: "{{ lookup('template', 'ovn_controller.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      ovn_controller: "{{ lookup('template', 'kolla_ovn_controller.yaml.j2') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@ovn_controller
+    enabled: true
+    state: started
+  become: true
+