diff --git a/files/tmpreaper.conf b/files/tmpreaper.conf
index 9b097db..f93f971 100644
--- a/files/tmpreaper.conf
+++ b/files/tmpreaper.conf
@@ -43,4 +43,4 @@ TMPREAPER_PROTECT_EXTRA=''
 TMPREAPER_DIRS='/tmp/.'
 TMPREAPER_DELAY='256'
 TMPREAPER_ADDITIONALOPTIONS='--runtime=600'
-TMPREAPER_TIME=1d
+TMPREAPER_TIME=12h
diff --git a/files/tmpreaper-cron.daily b/files/tmpreaper.sh
similarity index 100%
rename from files/tmpreaper-cron.daily
rename to files/tmpreaper.sh
diff --git a/manifests/init.pp b/manifests/init.pp
index 3473aa7..a42eddd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,23 +1,33 @@
 class tmpreaper() {
-   package { 'tmpreaper':
-      ensure => present,
-   }
+  package { 'tmpreaper':
+    ensure => present,
+  }
 
-   file { 'tmpreaper-cron.daily':
-      name => '/etc/cron.daily/tmpreaper',
-      ensure => 'present',
-      owner => 'root',
-      group => 'root',
-      mode => 755,
-      source => 'puppet:///modules/tmpreaper/tmpreaper-cron.daily',
-   }
+  file { '/etc/cron.daily/tmpreaper':
+    ensure => absent
+  }
 
-   file { 'tmpreaper.conf':
-      name => '/etc/tmpreaper.conf',
-      ensure => 'present',
-      owner => 'root',
-      group => 'root',
-      mode => 644,
-      source => 'puppet:///modules/tmpreaper/tmpreaper.conf',
-   }
+  file { '/usr/local/bin/tmpreaper.sh':
+    ensure => 'present',
+    owner  => 'root',
+    group  => 'root',
+    mode   => 755,
+    source => 'puppet:///modules/tmpreaper/tmpreaper.sh',
+  }
+
+  file { '/etc/tmpreaper.conf':
+    ensure => 'present',
+    owner  => 'root',
+    group  => 'root',
+    mode   => 644,
+    source => 'puppet:///modules/tmpreaper/tmpreaper.conf',
+  }
+
+  cron { 'tmpreaper':
+    user    => 'root',
+    minute  => '42',
+    hour    => '*/6',
+    command => 'sleep $((RANDOM\\%60+60)) && /usr/local/bin/tmpreaper.sh',
+    require => File['/usr/local/bin/tmpreaper.sh'],
+  }
 }