diff --git a/prod.hosts b/prod.hosts
index a841031..2acfd60 100644
--- a/prod.hosts
+++ b/prod.hosts
@@ -50,8 +50,9 @@ osm_default_node_selector='workload-app=true'
 # Make sure NTP is enabled
 openshift_clock_enabled=true
 
-# default router
+# Place router and registry on infra nodes
 openshift_hosted_router_selector='workload-infra=true'
+openshift_hosted_registry_selector='workload-infra=true'
 
 # Do not create the default project "my-project"
 openshift_additional_projects={}
diff --git a/test.hosts b/test.hosts
index 871c1c4..0b31e09 100644
--- a/test.hosts
+++ b/test.hosts
@@ -50,8 +50,9 @@ osm_default_node_selector='workload-app=true'
 # Make sure NTP is enabled
 openshift_clock_enabled=true
 
-# default router
+# Place router and registry on infra nodes
 openshift_hosted_router_selector='workload-infra=true'
+openshift_hosted_registry_selector='workload-infra=true'
 
 # Do not create the default project "my-project"
 openshift_additional_projects={}