diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 1170f85228..ad118b4271 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -89,6 +89,10 @@ class openstack_project::server (
     }
   }
 
+  class { 'openstack_project::automatic_upgrades':
+    origins => ["Puppetlabs:${lsbdistcodename}"],
+  }
+
   include snmpd
 
   class { 'openstack_project::template':
diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp
index 5976b03ad1..c1f0b01acf 100644
--- a/modules/openstack_project/manifests/single_use_slave.pp
+++ b/modules/openstack_project/manifests/single_use_slave.pp
@@ -2,17 +2,13 @@
 #
 # This class configures single use Jenkins slaves with a few
 # toggleable options. Most importantly sudo rights for the Jenkins
-# user are by default off but can be enabled. Also, automatic_upgrades
-# are off by default as the assumption is the backing image for
-# this single use slaves will be refreshed with new packages
-# periodically.
+# user are by default off but can be enabled.
 class openstack_project::single_use_slave (
   $certname = $::fqdn,
   $install_users = true,
   $install_resolv_conf = true,
   $sudo = false,
   $thin = true,
-  $automatic_upgrades = false,
   $all_mysql_privs = false,
   $ssh_key = $openstack_project::jenkins_ssh_key,
   $jenkins_gitfullname = 'OpenStack Jenkins',
@@ -21,7 +17,6 @@ class openstack_project::single_use_slave (
 ) inherits openstack_project {
   class { 'openstack_project::template':
     certname                  => $certname,
-    automatic_upgrades        => $automatic_upgrades,
     install_users             => $install_users,
     install_resolv_conf       => $install_resolv_conf,
     permit_root_login         => 'yes',
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 322ffc2038..32c928156d 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -12,7 +12,6 @@ class openstack_project::template (
   $pin_puppet                = '3.',
   $install_users             = true,
   $install_resolv_conf       = true,
-  $automatic_upgrades        = true,
   $certname                  = $::fqdn,
   $ca_server                 = undef,
   $afs                       = false,
@@ -68,15 +67,6 @@ class openstack_project::template (
   }
 
 
-  ###########################################################
-  # Process if ( $high_level_directive ) blocks
-
-  if $automatic_upgrades == true {
-    class { 'openstack_project::automatic_upgrades':
-      origins => ["Puppetlabs:${lsbdistcodename}"],
-    }
-  }
-
   class {'openstack_project::users_install':
     install_users => $install_users
   }