diff --git a/README.rst b/README.rst
index 1914361..fbdaaf9 100644
--- a/README.rst
+++ b/README.rst
@@ -249,6 +249,17 @@
           # Add key without value to remove line from policy.json
           'volume:extend':
 
+Default Cinder backend lvm_type setup
+
+.. code-block:: yaml
+
+    cinder:
+      volume:
+        enabled: true
+        backend:
+          # Type of LVM volumes to deploy; (default, thin, or auto). Auto defaults to thin if thin is supported.
+          lvm_type: auto
+
 
 Default Cinder setup with iSCSI target
 
diff --git a/cinder/files/backend/_lvm.conf b/cinder/files/backend/_lvm.conf
index b71fa23..e305056 100644
--- a/cinder/files/backend/_lvm.conf
+++ b/cinder/files/backend/_lvm.conf
@@ -3,6 +3,8 @@
 host={{ backend.get('host', grains.host) }}
 volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
 volume_backend_name={{ backend_name }}
-lvm_type = default
+{%- if backend.lvm_type is defined %}
+lvm_type = {{ backend.lvm_type }}
+{%- endif  %}
 iscsi_helper = tgtadm
 volume_group = {{ backend.volume_group }}
\ No newline at end of file
diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian
index 2cad9f7..c3750a7 100644
--- a/cinder/files/queens/cinder.conf.controller.Debian
+++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -3276,6 +3276,7 @@
 
 [keystone_authtoken]
 {%- set _data = controller.get('identity', {}) %}
+{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': controller.cacert_file}) %}{% endif %}
 {%- set auth_type = _data.get('auth_type', 'password') %}
 {%- include "oslo_templates/files/queens/keystonemiddleware/_auth_token.conf" %}
 {%- include "oslo_templates/files/queens/keystoneauth/_type_" + auth_type + ".conf" %}
diff --git a/cinder/files/queens/cinder.conf.volume.Debian b/cinder/files/queens/cinder.conf.volume.Debian
index b6c644b..6c4e023 100644
--- a/cinder/files/queens/cinder.conf.volume.Debian
+++ b/cinder/files/queens/cinder.conf.volume.Debian
@@ -3277,6 +3277,7 @@
 
 [keystone_authtoken]
 {%- set _data = volume.get('identity', {}) %}
+{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': volume.cacert_file}) %}{% endif %}
 {%- set auth_type = _data.get('auth_type', 'password') %}
 {%- include "oslo_templates/files/queens/keystonemiddleware/_auth_token.conf" %}
 {%- include "oslo_templates/files/queens/keystoneauth/_type_" + auth_type + ".conf" %}