diff --git a/modules/openstack_project/manifests/init.pp b/modules/openstack_project/manifests/init.pp
index 9bd1205b4e..8bc492a8de 100644
--- a/modules/openstack_project/manifests/init.pp
+++ b/modules/openstack_project/manifests/init.pp
@@ -2,7 +2,13 @@ class openstack_project {
 
   $jenkins_ssh_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtioTW2wh3mBRuj+R0Jyb/mLt5sjJ8dEvYyA8zfur1dnqEt5uQNLacW4fHBDFWJoLHfhdfbvray5wWMAcIuGEiAA2WEH23YzgIbyArCSI+z7gB3SET8zgff25ukXlN+1mBSrKWxIza+tB3NU62WbtO6hmelwvSkZ3d7SDfHxrc4zEpmHDuMhxALl8e1idqYzNA+1EhZpbcaf720mX+KD3oszmY2lqD1OkKMquRSD0USXPGlH3HK11MTeCArKRHMgTdIlVeqvYH0v0Wd1w/8mbXgHxfGzMYS1Ej0fzzJ0PC5z5rOqsMqY1X2aC1KlHIFLAeSf4Cx0JNlSpYSrlZ/RoiQ== hudson@hudson'
 
-  $sysadmin = hiera('sysadmins')
+  $sysadmins = [
+    'corvus@inaugust.com',
+    'mordred@inaugust.com',
+    'andrew@linuxjedi.co.uk',
+    'devananda.vdv@gmail.com',
+    'clark.boylan@gmail.com'
+    ]
 
   $project_list = [ {
      name => 'openstack/keystone',
diff --git a/modules/openstack_project/manifests/pypi.pp b/modules/openstack_project/manifests/pypi.pp
index 266ff9fb67..9a7f9a2a53 100644
--- a/modules/openstack_project/manifests/pypi.pp
+++ b/modules/openstack_project/manifests/pypi.pp
@@ -1,6 +1,7 @@
 class openstack_project::pypi {
   include tmpreaper
   include apt::unattended-upgrades
+  include openstack_project
 
   # include jenkins slave so that build deps are there for the pip download
   class { 'jenkins_slave':
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index efb27fda7a..87314b6245 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -25,6 +25,7 @@
 # 12:09 <@spearce> so. you get 5 milliseconds before aborting
 # thus, set it to 5000minutes until the bug is fixed.
 class openstack_project::review {
+  include openstack_project
   class { 'openstack_project::gerrit':
     ssl_cert_file => '/etc/ssl/certs/review.openstack.org.pem',
     ssl_key_file => '/etc/ssl/private/review.openstack.org.key',
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 25bbbd7640..3bcd4e048d 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -1,5 +1,6 @@
 # A server that we expect to run for some time
 class openstack_project::server ($iptables_public_tcp_ports = []) {
+  include openstack_project
   class { 'openstack_project::template':
     iptables_public_tcp_ports => $iptables_public_tcp_ports
   }
diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp
index 2e3cc8ceac..620587c77b 100644
--- a/modules/openstack_project/manifests/slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -1,4 +1,5 @@
 class openstack_project::slave {
+  include openstack_project
   include tmpreaper
   include apt::unattended-upgrades
   class { 'openstack_project::server':
diff --git a/modules/openstack_project/manifests/slave_template.pp b/modules/openstack_project/manifests/slave_template.pp
index acecde6ee5..5229f32f22 100644
--- a/modules/openstack_project/manifests/slave_template.pp
+++ b/modules/openstack_project/manifests/slave_template.pp
@@ -1,4 +1,5 @@
 class openstack_project::slave_template {
+  include openstack_project
   class { 'openstack_project::template':
     iptables_public_tcp_ports => []
   }