diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2
index d17f4ffc..81fd1fbc 100644
--- a/templates/cinder.conf.j2
+++ b/templates/cinder.conf.j2
@@ -135,9 +135,10 @@ hmac_keys = {{ cinder_profiler_hmac_key }}
 {% if cinder_barbican_enabled %}
 [barbican]
 auth_endpoint = {{ keystone_service_internaluri }}/v3
+barbican_endpoint_type = internal
 
 [key_manager]
-backend = castellan.key_manager.barbican_key_manager.BarbicanKeyManager
+backend = barbican
 {% endif %}
 
 [keystone_authtoken]