diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 612ee0b8bc209d749e1d9b738225458cbb0a6894..e3b53ad0eb2d1a5be5c12ba3215539a19cd75920 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -316,6 +316,9 @@ num_nova_fake_per_node: 5
 # Monitoring options are specified here
 enable_collectd: "no"
 
+# Clean images options are specified here
+enable_destroy_images: "no"
+
 ####################
 # Logging options
 ####################
diff --git a/ansible/roles/destroy/defaults/main.yml b/ansible/roles/destroy/defaults/main.yml
index 0d75e357dea39bef3df3d0d1547532d699eef1f0..3590870d5e4e13bcd341bfed10e5305d66c6b118 100644
--- a/ansible/roles/destroy/defaults/main.yml
+++ b/ansible/roles/destroy/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-destroy_include_images: no
+destroy_include_images: "{{ enable_destroy_images }}"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 7f9206119ecd2d00048eab977132818e41a9af84..3a4c8249b2ee268ce4d7fe4152ecfbcdca54b1f4 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -128,6 +128,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #enable_cinder_backend_nfs: "no"
 #enable_cloudkitty: "no"
 #enable_congress: "no"
+#enable_destroy_images: "no"
 #enable_etcd: "no"
 #enable_gnocchi: "no"
 #enable_grafana: "no"