diff --git a/manifests/site.pp b/manifests/site.pp
index fd391e86f0..743cb2babf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -392,10 +392,14 @@ node /^git(-fe\d+)?\.openstack\.org$/ {
 node /^git\d+\.openstack\.org$/ {
   $group = "git-server"
   include openstack_project
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [4443, 8080, 29418],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::git_backend':
     project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',
     vhost_name              => 'git.openstack.org',
-    sysadmins               => hiera('sysadmins', []),
     git_gerrit_ssh_key      => hiera('gerrit_replication_ssh_rsa_pubkey_contents', 'XXX'),
     ssl_cert_file_contents  => hiera('git_ssl_cert_file_contents', 'XXX'),
     ssl_key_file_contents   => hiera('git_ssl_key_file_contents', 'XXX'),
diff --git a/modules/openstack_project/manifests/git_backend.pp b/modules/openstack_project/manifests/git_backend.pp
index c6c2ca194a..40c0998774 100644
--- a/modules/openstack_project/manifests/git_backend.pp
+++ b/modules/openstack_project/manifests/git_backend.pp
@@ -17,7 +17,6 @@
 # == Class: openstack_project::git_backend
 class openstack_project::git_backend (
   $vhost_name = $::fqdn,
-  $sysadmins = [],
   $git_gerrit_ssh_key = '',
   $ssl_cert_file_contents = '',
   $ssl_key_file_contents = '',
@@ -34,11 +33,6 @@ class openstack_project::git_backend (
     url  => $project_config_repo,
   }
 
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [4443, 8080, 29418],
-    sysadmins                 => $sysadmins,
-  }
-
   include jeepyb
   include pip