diff --git a/glance/templates/bin/_bootstrap.sh.tpl b/glance/templates/bin/_bootstrap.sh.tpl
index 9f7c96b279..bf6407b284 100644
--- a/glance/templates/bin/_bootstrap.sh.tpl
+++ b/glance/templates/bin/_bootstrap.sh.tpl
@@ -25,6 +25,7 @@ cd /tmp/images
 openstack image show {{ .name  | quote }} || \
   { curl -O {{ .source_url }}{{ .image_file }}; \
   openstack image create {{ .name | quote }} \
+  {{ if .id -}} --id {{ .id }} {{ end -}} \
   --min-disk {{ .min_disk }} \
   --disk-format {{ .image_type }} \
   --file {{ .image_file }} \
diff --git a/glance/values.yaml b/glance/values.yaml
index 1e45fe850c..fda9eea928 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -64,6 +64,7 @@ bootstrap:
   enabled: true
   images:
     cirros:
+      id: null
       name: "Cirros 0.3.5 64-bit"
       source_url: "http://download.cirros-cloud.net/0.3.5/"
       image_file: "cirros-0.3.5-x86_64-disk.img"