diff --git a/manifests/xrootd.pp b/manifests/xrootd.pp
index 2b1d5f98..453014ef 100644
--- a/manifests/xrootd.pp
+++ b/manifests/xrootd.pp
@@ -2,7 +2,6 @@
 class sunet::xrootd(
   Array[Hash] $cms_allow_hosts,
   Array       $managers,
-  String      $manager_domain,
   String      $cms_port                 = '1213',
   String      $container_image          = 'docker.sunet.se/staas/xrootd-s3-http',
   String      $container_tag            = '0.17.0-1',
diff --git a/templates/xrootd/docker-compose.erb.yml b/templates/xrootd/docker-compose.erb.yml
index e618b02b..64492109 100644
--- a/templates/xrootd/docker-compose.erb.yml
+++ b/templates/xrootd/docker-compose.erb.yml
@@ -9,8 +9,6 @@ services:
       - "<%= extra_host['name'] %>:<%= extra_host['ipv4'] %>"
       - "<%= extra_host['name'] %>:<%= extra_host['ipv6'] %>"
       <%- if @managers.include?(extra_host['name']) -%>
-      - "<%= @manager_domain %>:<%= extra_host['ipv4'] %>"
-      - "<%= @manager_domain %>:<%= extra_host['ipv6'] %>"
       - "<%= extra_host['name'].split('.')[0] %>:<%= extra_host['ipv4'] %>"
       - "<%= extra_host['name'].split('.')[0] %>:<%= extra_host['ipv6'] %>"
       <%- end -%>
@@ -33,8 +31,6 @@ services:
       - "<%= extra_host['name'] %>:<%= extra_host['ipv4'] %>"
       - "<%= extra_host['name'] %>:<%= extra_host['ipv6'] %>"
       <%- if @managers.include?(extra_host['name']) -%>
-      - "<%= @manager_domain %>:<%= extra_host['ipv4'] %>"
-      - "<%= @manager_domain %>:<%= extra_host['ipv6'] %>"
       - "<%= extra_host['name'].split('.')[0] %>:<%= extra_host['ipv4'] %>"
       - "<%= extra_host['name'].split('.')[0] %>:<%= extra_host['ipv6'] %>"
       <%- end -%>
diff --git a/templates/xrootd/xrootd-manager.cfg.erb b/templates/xrootd/xrootd-manager.cfg.erb
index 1e66be9f..feac7bd1 100644
--- a/templates/xrootd/xrootd-manager.cfg.erb
+++ b/templates/xrootd/xrootd-manager.cfg.erb
@@ -20,6 +20,7 @@ all.pidpath <%= @xrootd_admin_path %>
 <%- @cms_allow_hosts.each do |extra_host| -%>
 <%- if @managers.include?(extra_host['name']) -%>
 all.manager all <%= extra_host['name'].split('.')[0] %> <%= @xrootd_port %> 
+all.manager all <%= extra_host['name'] %> <%= @xrootd_port %> 
 <%- end -%>
 <%- end -%>
 all.role manager
diff --git a/templates/xrootd/xrootd-server.cfg.erb b/templates/xrootd/xrootd-server.cfg.erb
index abe3d8a8..b8f88bda 100644
--- a/templates/xrootd/xrootd-server.cfg.erb
+++ b/templates/xrootd/xrootd-server.cfg.erb
@@ -20,6 +20,7 @@ all.pidpath <%= @xrootd_admin_path %>
 <%- @cms_allow_hosts.each do |extra_host| -%>
 <%- if @managers.include?(extra_host['name']) -%>
 all.manager all <%= extra_host['name'].split('.')[0] %> <%= @xrootd_port %> 
+all.manager all <%= extra_host['name'] %> <%= @xrootd_port %> 
 <%- end -%>
 <%- end -%>
 all.role server