diff --git a/modules/openstack_project/manifests/pypi_mirror.pp b/modules/openstack_project/manifests/pypi_mirror.pp
index a9f09db95a..6ef79daaef 100644
--- a/modules/openstack_project/manifests/pypi_mirror.pp
+++ b/modules/openstack_project/manifests/pypi_mirror.pp
@@ -55,9 +55,13 @@ class openstack_project::pypi_mirror (
     ensure => directory,
   }
 
+  file { '/var/run/bandersnatch':
+    ensure => directory,
+  }
+
   cron { 'bandersnatch':
     minute      => '*/5',
-    command     => 'run-bandersnatch >>/var/log/bandersnatch/mirror.log 2>&1',
+    command     => 'flock -n /var/run/bandersnatch/mirror.lock timeout -k 2m 30m run-bandersnatch >>/var/log/bandersnatch/mirror.log 2>&1',
     environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
   }