diff --git a/environments/neutron-ml2-ovn-dvr-ha.yaml b/environments/neutron-ml2-ovn-dvr-ha.yaml
index 7568d56f47..b550f0615d 100644
--- a/environments/neutron-ml2-ovn-dvr-ha.yaml
+++ b/environments/neutron-ml2-ovn-dvr-ha.yaml
@@ -8,7 +8,9 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
 
diff --git a/environments/neutron-ml2-ovn-dvr.yaml b/environments/neutron-ml2-ovn-dvr.yaml
index 93f3116ed2..bac9a3b637 100644
--- a/environments/neutron-ml2-ovn-dvr.yaml
+++ b/environments/neutron-ml2-ovn-dvr.yaml
@@ -9,7 +9,9 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
 
 parameter_defaults:
diff --git a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
index 6b3c824286..414d75ae89 100644
--- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
@@ -7,7 +7,9 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
 
diff --git a/environments/services-baremetal/neutron-ovn-dvr.yaml b/environments/services-baremetal/neutron-ovn-dvr.yaml
index 6dd1cd293c..a20b9d4b6b 100644
--- a/environments/services-baremetal/neutron-ovn-dvr.yaml
+++ b/environments/services-baremetal/neutron-ovn-dvr.yaml
@@ -7,7 +7,9 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
 
diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml
index b485515521..b75cc83f95 100644
--- a/environments/services/neutron-ovn-dvr-ha.yaml
+++ b/environments/services/neutron-ovn-dvr-ha.yaml
@@ -8,7 +8,9 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
 
diff --git a/environments/services/neutron-ovn-dvr.yaml b/environments/services/neutron-ovn-dvr.yaml
index ab69a296c5..33b3c4ae7f 100644
--- a/environments/services/neutron-ovn-dvr.yaml
+++ b/environments/services/neutron-ovn-dvr.yaml
@@ -8,7 +8,9 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None