diff --git a/manifests/site.pp b/manifests/site.pp
index 673a6c0039..c6362e1f9d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -27,6 +27,12 @@ class openstack_base {
                "python-setuptools",
                "byobu"]
   package { $packages: ensure => "latest" }
+
+  cron { "updatepuppet":
+    user => root,
+    minute => "*/15",
+    command => "sleep $((RANDOM\%600)) && cd /root/openstack-ci-puppet && /usr/bin/git pull -q && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp",
+  }
 }
 
 class openstack_server {
diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index c83d9eaf0e..a01dd3b8e3 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -13,13 +13,6 @@ class jenkins_slave {
       ensure => present,
     }
 
-    cron { "updatepuppet":
-      user => root,
-      minute => "*/15",
-      command => "cd /root/openstack-ci-puppet && /usr/bin/git pull -q && /var/lib/gems/1.8/bin/puppet apply -l /tmp/manifest.log --modulepath=/root/openstack-ci-puppet/modules manifests/site.pp",
-      require => [ Jenkinsuser[jenkins] ]
-    }
-
     cron { "updateci":
       user => jenkins,
       minute => "*/15",