diff --git a/environments/services-baremetal/neutron-opendaylight-hw-offload.yaml b/environments/services-baremetal/neutron-opendaylight-hw-offload.yaml
index b427377d55..7b7e4251f6 100644
--- a/environments/services-baremetal/neutron-opendaylight-hw-offload.yaml
+++ b/environments/services-baremetal/neutron-opendaylight-hw-offload.yaml
@@ -3,6 +3,8 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  OS::TripleO::Services::OVNDBs: OS::Heat::None
+  OS::TripleO::Services::OVNController: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: ../../puppet/services/neutron-plugin-ml2-odl.yaml
   OS::TripleO::Services::OpenDaylightApi: ../../puppet/services/opendaylight-api.yaml
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
diff --git a/environments/services-baremetal/neutron-opendaylight.yaml b/environments/services-baremetal/neutron-opendaylight.yaml
index a828c36d4a..bfbe0be7b3 100644
--- a/environments/services-baremetal/neutron-opendaylight.yaml
+++ b/environments/services-baremetal/neutron-opendaylight.yaml
@@ -3,6 +3,8 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  OS::TripleO::Services::OVNDBs: OS::Heat::None
+  OS::TripleO::Services::OVNController: OS::Heat::None
   OS::TripleO::Services::OpenDaylightApi: ../../puppet/services/opendaylight-api.yaml
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
diff --git a/environments/services/neutron-opendaylight-hw-offload.yaml b/environments/services/neutron-opendaylight-hw-offload.yaml
index 36fa749c69..82af15830d 100644
--- a/environments/services/neutron-opendaylight-hw-offload.yaml
+++ b/environments/services/neutron-opendaylight-hw-offload.yaml
@@ -3,6 +3,8 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  OS::TripleO::Services::OVNDBs: OS::Heat::None
+  OS::TripleO::Services::OVNController: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: ../../puppet/services/neutron-plugin-ml2-odl.yaml
   OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
   # FIXME(bogdando): switch it, once it is containerized
diff --git a/environments/services/neutron-opendaylight.yaml b/environments/services/neutron-opendaylight.yaml
index c2504d60f0..9c0d4b8453 100644
--- a/environments/services/neutron-opendaylight.yaml
+++ b/environments/services/neutron-opendaylight.yaml
@@ -3,6 +3,8 @@ resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  OS::TripleO::Services::OVNDBs: OS::Heat::None
+  OS::TripleO::Services::OVNController: OS::Heat::None
   OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
   # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml