diff --git a/manifests/site.pp b/manifests/site.pp
index eec59ce867..00b13df9ec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -312,6 +312,11 @@ node 'eavesdrop.openstack.org' {
 
 # Node-OS: precise
 node 'etherpad.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::etherpad':
     ssl_cert_file_contents  => hiera('etherpad_ssl_cert_file_contents', 'XXX'),
     ssl_key_file_contents   => hiera('etherpad_ssl_key_file_contents', 'XXX'),
@@ -319,17 +324,20 @@ node 'etherpad.openstack.org' {
     mysql_host              => hiera('etherpad_db_host', 'localhost'),
     mysql_user              => hiera('etherpad_db_user', 'username'),
     mysql_password          => hiera('etherpad_db_password', 'XXX'),
-    sysadmins               => hiera('sysadmins', []),
   }
 }
 
 # Node-OS: precise
 node 'etherpad-dev.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [22, 80, 443],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::etherpad_dev':
     mysql_host          => hiera('etherpad-dev_db_host', 'localhost'),
     mysql_user          => hiera('etherpad-dev_db_user', 'username'),
     mysql_password      => hiera('etherpad-dev_db_password', 'XXX'),
-    sysadmins           => hiera('sysadmins', []),
   }
 }
 
diff --git a/modules/openstack_project/manifests/etherpad.pp b/modules/openstack_project/manifests/etherpad.pp
index 52cc086ba9..122aa2f527 100644
--- a/modules/openstack_project/manifests/etherpad.pp
+++ b/modules/openstack_project/manifests/etherpad.pp
@@ -8,14 +8,8 @@ class openstack_project::etherpad (
   $ssl_chain_file_contents = '',
   $mysql_host = 'localhost',
   $mysql_user = 'eplite',
-  $mysql_db_name = 'etherpad-lite',
-  $sysadmins = []
+  $mysql_db_name = 'etherpad-lite'
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins
-  }
-
   class { 'etherpad_lite':
     ep_ensure      => 'latest',
     eplite_version => '2bf16fe09fe9a6af804666d15ff4704620369d9f',
diff --git a/modules/openstack_project/manifests/etherpad_dev.pp b/modules/openstack_project/manifests/etherpad_dev.pp
index 8fa7898cee..54b9aa03b7 100644
--- a/modules/openstack_project/manifests/etherpad_dev.pp
+++ b/modules/openstack_project/manifests/etherpad_dev.pp
@@ -2,14 +2,8 @@ class openstack_project::etherpad_dev (
   $mysql_password,
   $mysql_host = 'localhost',
   $mysql_user = 'eplite',
-  $mysql_db_name = 'etherpad-lite',
-  $sysadmins = []
+  $mysql_db_name = 'etherpad-lite'
 ) {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80, 443],
-    sysadmins                 => $sysadmins
-  }
-
   class { 'etherpad_lite':
     ep_ensure => 'latest',
   }