diff --git a/files/cleanup-docker-storage b/files/cleanup-docker-storage
new file mode 100644
index 0000000000..b97dc2da71
--- /dev/null
+++ b/files/cleanup-docker-storage
@@ -0,0 +1,4 @@
+SHELL=/bin/bash
+MAILTO=maxamillion@fedoraproject.org
+
+0 0 * * * root for i in for i in $(docker ps -a | awk '/Exited/ { print $1 }'); do docker rm $i; done && for i in $(docker images -q -f 'dangling=true'); do docker rmi $i; done
\ No newline at end of file
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index aca757bc43..237debdcb7 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -40,6 +40,11 @@
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   tasks:
+    - name: cron entry to clean up docker storage
+      copy:
+        src: "{{files}}/osbs/cleanup-docker-storage"
+        dest: "/etc/cron.d/cleanup-docker-storage"
+
     - name: copy docker-storage-setup config
       copy:
         src: "{{files}}/osbs/docker-storage-setup"