diff --git a/manifests/role/bastionhost.pp b/manifests/role/bastionhost.pp
index 8d141d3..a06cc7d 100644
--- a/manifests/role/bastionhost.pp
+++ b/manifests/role/bastionhost.pp
@@ -8,6 +8,11 @@ class role::bastionhost::general {
     include base::firewall
     include role::backup::host
 
+    class { 'standard': has_admin => false }
+    $admin_module_path = get_module_path('admin')
+    $admin_data = loadyaml("${admin_module_path}/data/data.yaml")
+    class { 'admin': keys($admin_data['groups']) }
+
     backup::set {'home': }
 
     ferm::service { 'ssh':
diff --git a/manifests/site.pp b/manifests/site.pp
index 74e046c..526bc89 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -236,7 +236,6 @@ node 'bast1001.wikimedia.org' {
     $ganglia_aggregator = true
     role bastionhost::general
 
-    include standard
     include dsh
 }
 
@@ -246,7 +245,6 @@ node 'bast2001.wikimedia.org' {
         interface => 'eth0',
     }
     role bastionhost::general
-    include standard
 
 }
 
@@ -257,7 +255,6 @@ node 'bast4001.wikimedia.org' {
     }
 
     role bastionhost::general
-    include standard
     include role::ipmi
     include role::installserver::tftp-server
 
@@ -1109,7 +1106,6 @@ node 'hooft.esams.wikimedia.org' {
     }
     role bastionhost::general
 
-    include standard
     include role::installserver::tftp-server
 
     class { 'ganglia::monitor::aggregator':
@@ -1190,7 +1186,6 @@ node 'iron.wikimedia.org' {
     }
     role bastionhost::opsonly
 
-    include standard
     include role::ipmi
     include role::access_new_install
 }