diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian
index caf6d5f..30fe800 100644
--- a/cinder/files/queens/cinder.conf.controller.Debian
+++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -463,11 +463,15 @@
 
 # ID of the project which will be used as the Cinder internal tenant. (string
 # value)
-#cinder_internal_tenant_project_id = <None>
+{%- if controller.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
+{%- endif %}
 
 # ID of the user to be used in volume operations as the Cinder internal tenant.
 # (string value)
-#cinder_internal_tenant_user_id = <None>
+{%- if controller.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
+{%- endif %}
 
 # Services to be added to the available pool on create (boolean value)
 #enable_new_services = true
@@ -1090,12 +1094,6 @@
 {%- if controller.nas_secure_file_operations is defined %}
 nas_secure_file_operations={{ controller.nas_secure_file_operations }}
 {%- endif %}
-{%- if controller.cinder_internal_tenant_user_id is defined %}
-cinder_internal_tenant_user_id={{ controller.cinder_internal_tenant_user_id }}
-{%- endif %}
-{%- if controller.cinder_internal_tenant_project_id is defined %}
-cinder_internal_tenant_project_id={{ controller.cinder_internal_tenant_project_id }}
-{%- endif %}
 
 #
 # From cinder
diff --git a/cinder/files/queens/cinder.conf.volume.Debian b/cinder/files/queens/cinder.conf.volume.Debian
index a46b222..8a526be 100644
--- a/cinder/files/queens/cinder.conf.volume.Debian
+++ b/cinder/files/queens/cinder.conf.volume.Debian
@@ -457,11 +457,15 @@
 
 # ID of the project which will be used as the Cinder internal tenant. (string
 # value)
-#cinder_internal_tenant_project_id = <None>
+{%- if volume.cinder_internal_tenant_project_id is defined %}
+cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
+{%- endif %}
 
 # ID of the user to be used in volume operations as the Cinder internal tenant.
 # (string value)
-#cinder_internal_tenant_user_id = <None>
+{%- if volume.cinder_internal_tenant_user_id is defined %}
+cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
+{%- endif %}
 
 # Services to be added to the available pool on create (boolean value)
 #enable_new_services = true
@@ -1089,12 +1093,6 @@
 {%- if volume.nas_secure_file_operations is defined %}
 nas_secure_file_operations={{ volume.nas_secure_file_operations }}
 {%- endif %}
-{%- if volume.cinder_internal_tenant_user_id is defined %}
-cinder_internal_tenant_user_id={{ volume.cinder_internal_tenant_user_id }}
-{%- endif %}
-{%- if volume.cinder_internal_tenant_project_id is defined %}
-cinder_internal_tenant_project_id={{ volume.cinder_internal_tenant_project_id }}
-{%- endif %}
 
 #
 # From cinder