diff --git a/manifests/site.pp b/manifests/site.pp
index 1f1c94ded4..6ad88210e4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -226,8 +226,11 @@ node 'graphite.openstack.org' {
 
 # Node-OS: precise
 node 'groups.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
   class { 'openstack_project::groups':
-    sysadmins                    => hiera('sysadmins', []),
     site_admin_password          => hiera('groups_site_admin_password', 'XXX'),
     site_mysql_host              => hiera('groups_site_mysql_host', 'localhost'),
     site_mysql_password          => hiera('groups_site_mysql_password', 'XXX'),
@@ -240,8 +243,11 @@ node 'groups.openstack.org' {
 
 # Node-OS: precise
 node 'groups-dev.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
   class { 'openstack_project::groups_dev':
-    sysadmins                    => hiera('sysadmins', []),
     site_admin_password          => hiera('groups_dev_site_admin_password', 'XXX'),
     site_mysql_host              => hiera('groups_dev_site_mysql_host', 'localhost'),
     site_mysql_password          => hiera('groups_dev_site_mysql_password', 'XXX'),
diff --git a/modules/openstack_project/manifests/groups.pp b/modules/openstack_project/manifests/groups.pp
index fec056fce2..4595752109 100644
--- a/modules/openstack_project/manifests/groups.pp
+++ b/modules/openstack_project/manifests/groups.pp
@@ -20,7 +20,6 @@ class openstack_project::groups (
   $site_mysql_password = '',
   $site_mysql_user = 'groups',
   $conf_cron_key = '',
-  $sysadmins = [],
   $site_ssl_cert_file_contents = undef,
   $site_ssl_key_file_contents = undef,
   $site_ssl_chain_file_contents = undef,
@@ -33,11 +32,6 @@ class openstack_project::groups (
     User::Virtual::Localuser['mkiss'],
   )
 
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins,
-  }
-
   vcsrepo { '/srv/groups-static-pages':
     ensure   => latest,
     provider => git,
diff --git a/modules/openstack_project/manifests/groups_dev.pp b/modules/openstack_project/manifests/groups_dev.pp
index 4b0d205f66..0f6d3ef9a3 100644
--- a/modules/openstack_project/manifests/groups_dev.pp
+++ b/modules/openstack_project/manifests/groups_dev.pp
@@ -19,7 +19,6 @@ class openstack_project::groups_dev (
   $site_mysql_host     = '',
   $site_mysql_password = '',
   $conf_cron_key = '',
-  $sysadmins = [],
   $site_ssl_cert_file_contents = undef,
   $site_ssl_key_file_contents = undef,
   $site_ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
@@ -32,11 +31,6 @@ class openstack_project::groups_dev (
 
 #  include drupal
 
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins,
-  }
-
   vcsrepo { '/srv/groups-static-pages':
     ensure   => latest,
     provider => git,