diff --git a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml
index 764abd443d..f3fe69f6bb 100644
--- a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml
@@ -122,3 +122,13 @@
     - name: create buildroot container
       shell: atomic-reactor create-build-image --reactor-tarball-path /usr/share/atomic-reactor/atomic-reactor.tar.gz /usr/share/atomic-reactor/images/dockerhost-builder buildroot
 
+    - name: clean up exited containers
+      shell: for i in $(docker ps -a | awk '/Exited/ { print $1 }') ; do docker rm $i; done
+      tags:
+        - cleanup
+
+    - name: clean up dangling images
+      shell: for i in $(docker images -q -f "dangling=true") ; do docker rmi $i; done
+      tags:
+        - cleanup
+