diff --git a/docker-host/setup/handlers/docker-cleanup.yml b/docker-host/setup/handlers/docker-cleanup.yml
new file mode 100644
index 0000000..cf44cc6
--- /dev/null
+++ b/docker-host/setup/handlers/docker-cleanup.yml
@@ -0,0 +1,6 @@
+- name: Cleanup old containers
+  become: yes
+  become_method: sudo
+  listen: cleanup-docker
+  command: docker images | grep none | awk '{print $3}' | xargs docker rmi
+