diff --git a/glance/templates/bin/_clean.sh.tpl b/glance/templates/bin/_clean.sh.tpl
index 11f7186e2e..b3a5d669e5 100644
--- a/glance/templates/bin/_clean.sh.tpl
+++ b/glance/templates/bin/_clean.sh.tpl
@@ -18,11 +18,10 @@ set -ex
 {{ if .Values.bootstrap.enabled }}
 {{ range .Values.bootstrap.images }}
   {{ if .id -}}
-    echo "Delete Glance Bootstrap Image..."
-    openstack image delete {{ .id }}
+    openstack image show {{ .id | quote }} && \
+      openstack image delete {{ .id | quote }}
   {{ end -}}
 {{ end }}
 
 {{ end }}
 exit 0
-