diff --git a/tobiko/podified/_topology.py b/tobiko/podified/_topology.py
index d12e8dd7a..6830c7597 100644
--- a/tobiko/podified/_topology.py
+++ b/tobiko/podified/_topology.py
@@ -54,17 +54,23 @@ class PodifiedTopology(rhosp.RhospTopology):
 
     # NOTE(slaweq): those service names are only valid for the EDPM nodes
     agent_to_service_name_mappings = {
-        neutron.DHCP_AGENT: 'tripleo_neutron_dhcp',
-        neutron.OVN_METADATA_AGENT: 'tripleo_ovn_metadata_agent',
-        neutron.NEUTRON_OVN_METADATA_AGENT: 'tripleo_ovn_metadata_agent',
-        neutron.OVN_CONTROLLER: 'tripleo_ovn_controller',
-        neutron.OVN_BGP_AGENT: 'tripleo_ovn_bgp_agent',
-        neutron.FRR: 'tripleo_frr'
+        neutron.DHCP_AGENT: 'edpm_neutron_dhcp',
+        neutron.L3_AGENT:  'edpm_neutron_l3_agent',
+        neutron.OPENVSWITCH_AGENT: 'edpm_neutron_ovs_agent',
+        neutron.METADATA_AGENT: 'edpm_neutron_metadata_agent',
+        neutron.OVN_METADATA_AGENT: 'edpm_ovn_metadata_agent',
+        neutron.NEUTRON_OVN_METADATA_AGENT: 'edpm_ovn_metadata_agent',
+        neutron.OVN_CONTROLLER: 'edpm_ovn_controller',
+        neutron.OVN_BGP_AGENT: 'edpm_ovn_bgp_agent',
+        neutron.FRR: 'edpm_frr'
     }
 
     # NOTE(slaweq): those container names are only valid for the EDPM nodes
     agent_to_container_name_mappings = {
         neutron.DHCP_AGENT: 'neutron_dhcp',
+        neutron.L3_AGENT:  'neutron_l3_agent',
+        neutron.OPENVSWITCH_AGENT: 'neutron_ovs_agent',
+        neutron.METADATA_AGENT: 'neutron_metadata_agent',
         neutron.OVN_METADATA_AGENT: 'ovn_metadata_agent',
         neutron.NEUTRON_OVN_METADATA_AGENT: 'ovn_metadata_agent',
         neutron.OVN_CONTROLLER: 'ovn_controller',