diff --git a/manifests/site.pp b/manifests/site.pp
index 1939245401..2bcd7e79d1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,6 +18,20 @@ class openstack_cron {
   }
 }
 
+class remove_openstack_cron {
+  cron { "updatepuppet":
+    ensure => absent
+  }
+
+  file { '/etc/init/puppetboot.conf':
+    ensure => absent
+  }
+
+  file { "/etc/logrotate.d/updatepuppet":
+    ensure => absent
+  }
+}
+
 class openstack_jenkins_slave {
   include openstack_cron
   include tmpreaper
@@ -357,7 +371,7 @@ node "docs.openstack.org" {
 }
 
 node "paste.openstack.org" {
-  include openstack_cron
+  include remove_openstack_cron
   class { 'openstack_server':
     iptables_public_tcp_ports => [80]
   }
@@ -374,7 +388,7 @@ node "paste.openstack.org" {
 }
 
 node "planet.openstack.org" {
-  include openstack_cron
+  include remove_openstack_cron
   class { 'openstack_server':
     iptables_public_tcp_ports => [80]
   }
@@ -386,7 +400,7 @@ node "planet.openstack.org" {
 }
 
 node "eavesdrop.openstack.org" {
-  include openstack_cron
+  include remove_openstack_cron
   class { 'openstack_server':
     iptables_public_tcp_ports => [80]
   }