diff --git a/ansible/roles/cleanup/defaults/main.yml b/ansible/roles/cleanup/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6c65e69530cf1c84b0f4a01ac7dcca60ec022c7b
--- /dev/null
+++ b/ansible/roles/cleanup/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+cleanup_include_images: no
diff --git a/ansible/roles/cleanup/tasks/cleanup_images.yml b/ansible/roles/cleanup/tasks/cleanup_images.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9b03f274c0f50f6b8100594eb417150e517f20af
--- /dev/null
+++ b/ansible/roles/cleanup/tasks/cleanup_images.yml
@@ -0,0 +1,5 @@
+---
+- name: Cleaning Kolla images
+  command: /tmp/kolla-cleanup/tools/cleanup-images
+  when:
+    - cleanup_include_images | bool
diff --git a/ansible/roles/cleanup/tasks/copy_tools.yml b/ansible/roles/cleanup/tasks/copy_tools.yml
index 737233c8e7318ef4bc2a74022fa5d1172e8996fe..192d3bf537f36cd9d37a3ecf4c192c901357aa04 100644
--- a/ansible/roles/cleanup/tasks/copy_tools.yml
+++ b/ansible/roles/cleanup/tasks/copy_tools.yml
@@ -21,3 +21,11 @@
     src: ../tools/cleanup-host
     dest: /tmp/kolla-cleanup/tools
     mode: 0755
+
+- name: Copying cleanup-images file
+  copy:
+    src: ../tools/cleanup-images
+    dest: /tmp/kolla-cleanup/tools
+    mode: 0755
+  when:
+    - cleanup_include_images | bool
diff --git a/ansible/roles/cleanup/tasks/main.yml b/ansible/roles/cleanup/tasks/main.yml
index d7f8b1e1e20c9b98982ada97533ef951f71ed4a2..13b59b7fbfd95a3018dd97388ed8e2a54c470814 100644
--- a/ansible/roles/cleanup/tasks/main.yml
+++ b/ansible/roles/cleanup/tasks/main.yml
@@ -3,4 +3,6 @@
 
 - include: cleanup_containers.yml
 
+- include: cleanup_images.yml
+
 - include: cleanup_host.yml
diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index 00a93075d6fb43214ca26fe41a97b7643e68b7ce..d3416fb5876548d47d18b9d14655617458c6c8a1 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -43,6 +43,7 @@ Commands:
     mariadb_recovery    Recover a completely stopped mariadb cluster
     deploy              Deploy and start all kolla containers
     cleanup             Cleanup containers, volumes and host
+                        ('-e cleanup_include_images=yes' to also remove Kolla images)
     post-deploy         Do post deploy on deploy node
     pull                Pull all images for containers (only pulls, no running container changes)
     reconfigure         Reconfigure OpenStack service