diff --git a/manifests/site.pp b/manifests/site.pp
index 3e51412ab6..42d3d58edc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1122,6 +1122,16 @@ node /^zm\d+\.openstack\.org$/ {
 
 # Node-OS: trusty
 node 'zuul-dev.openstack.org' {
+  $gearman_workers = []
+  $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
+
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80],
+    iptables_rules6           => $iptables_rules,
+    iptables_rules4           => $iptables_rules,
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
   class { 'openstack_project::zuul_dev':
     project_config_repo  => 'https://git.openstack.org/openstack-infra/project-config',
     gerrit_server        => 'review-dev.openstack.org',
@@ -1130,9 +1140,7 @@ node 'zuul-dev.openstack.org' {
     zuul_ssh_private_key => hiera('zuul_dev_ssh_private_key_contents'),
     url_pattern          => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}',
     zuul_url             => 'http://zuul-dev.openstack.org/p',
-    sysadmins            => hiera('sysadmins', []),
     statsd_host          => 'graphite.openstack.org',
-    gearman_workers      => [],
   }
 }
 
diff --git a/modules/openstack_project/manifests/zuul_dev.pp b/modules/openstack_project/manifests/zuul_dev.pp
index 52b6cd119a..f36f53f2ca 100644
--- a/modules/openstack_project/manifests/zuul_dev.pp
+++ b/modules/openstack_project/manifests/zuul_dev.pp
@@ -10,9 +10,7 @@ class openstack_project::zuul_dev(
   $url_pattern = '',
   $status_url = 'http://zuul-dev.openstack.org',
   $zuul_url = '',
-  $sysadmins = [],
   $statsd_host = '',
-  $gearman_workers = [],
   $project_config_repo = '',
 ) {
 
@@ -20,16 +18,6 @@ class openstack_project::zuul_dev(
     User::Virtual::Localuser['zaro'],
   )
 
-  # Turn a list of hostnames into a list of iptables rules
-  $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
-
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80],
-    iptables_rules6           => $iptables_rules,
-    iptables_rules4           => $iptables_rules,
-    sysadmins                 => $sysadmins,
-  }
-
   class { 'openstackci::zuul_scheduler':
     vhost_name               => $vhost_name,
     gearman_server           => $gearman_server,