diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 64a12ddd52..bcb3f16595 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -118,6 +118,7 @@ rados_connect_timeout = 5
 rbd_user = cinder
 rbd_secret_uuid = {{ cinder_rbd_secret_uuid }}
 report_discard_supported = True
+image_upload_use_cinder_backend = True
 {% endif %}
 
 {% if enable_cinder_backend_nfs | bool %}
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml
index 139825d34a..52d1d243e2 100644
--- a/ansible/roles/glance/defaults/main.yml
+++ b/ansible/roles/glance/defaults/main.yml
@@ -62,10 +62,16 @@ glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}"
 # Glance
 ####################
 glance_backends:
-  - name: "rbd,http"
+  - name: file
+    enabled: true
+  - name: http
+    enabled: true
+  - name: "rbd"
     enabled: "{{ enable_ceph | bool and glance_backend_ceph | bool }}"
   - name: "vmware"
     enabled: "{{ glance_backend_vmware | bool }}"
+  - name: cinder
+    enabled: "{{ enable_cinder | bool }}"
 
 glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true)|list }}"