diff --git a/environments/computealt.yaml b/environments/computealt.yaml
index 4b73020ba0..2aad82a2b4 100644
--- a/environments/computealt.yaml
+++ b/environments/computealt.yaml
@@ -11,4 +11,4 @@ resource_registry:
   OS::TripleO::Services::NovaMigrationTargetAlt: ../deployment/nova/nova-migration-target-container-puppet.yaml
   OS::TripleO::Services::OVNControllerAlt: OS::Heat::None
   # If enabling OVN you'll need provide the following in a specific resource_registry
-  # OS::TripleO::Services::OVNControllerAlt: ../puppet/services/ovn-controller.yaml
+  # OS::TripleO::Services::OVNControllerAlt: ../deployment/ovn/ovn-controller-container-puppet.yaml
diff --git a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
index 51045c812a..b395b82364 100644
--- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
@@ -1,7 +1,7 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
   OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
-  OS::TripleO::Services::OVNController: ../../puppet/services/ovn-controller.yaml
+  OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
 # Disabling Neutron services that overlap with OVN
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 1bc04045a8..35e1356cd4 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -247,9 +247,9 @@ VALIDATE_PUPPET_OVERRIDE = {
   './deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml': False,
   './deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml': False,
   # qdr aliases rabbitmq service to provide alternative messaging backend
-  './puppet/services/qdr.yaml': False,
+  './deployment/qdr/qdroutered-container-puppet.yaml': False,
   # puppet/services/messaging/*.yaml provide oslo_messaging services
-  './puppet/services/messaging/rpc-qdrouterd.yaml': False,
+  './deployment/messaging/rpc-qdrouterd-container-puppet.yaml': False,
 
 }
 VALIDATE_DOCKER_OVERRIDE = {