diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp
index 6f7eccad57..57b6bc43ae 100644
--- a/modules/openstack_project/manifests/slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -10,7 +10,6 @@ class openstack_project::slave (
 ) {
 
   include openstack_project
-  include openstack_project::automatic_upgrades
   include openstack_project::tmpcleanup
 
   class { 'openstack_project::server':
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 9c32acc4a5..7bb597c579 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -18,7 +18,9 @@ class openstack_project::template (
   include ssh
   include snmpd
   if $automatic_upgrades == true {
-    include openstack_project::automatic_upgrades
+    class { 'openstack_project::automatic_upgrades':
+      origins => "Puppetlabs:${lsbdistcodename}",
+    }
   }
 
   class { 'iptables':