diff --git a/templates/adjutant.yaml.j2 b/templates/adjutant.yaml.j2
index 6149125..00d90e3 100644
--- a/templates/adjutant.yaml.j2
+++ b/templates/adjutant.yaml.j2
@@ -27,7 +27,7 @@ identity:
   can_edit_users: True
   username_is_email: True
   role_mapping:
-  {{ adjutant_role_mapping | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_role_mapping | to_nice_yaml(indent=2, width=140) | indent(4, True) }}
   auth:
     username: {{ adjutant_service_user_name }}
     password: {{ adjutant_service_password }}
@@ -38,7 +38,7 @@ identity:
 
 api:
   active_delegate_apis:
-  {{ adjutant_active_delegate_apis | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_active_delegate_apis | to_nice_yaml(indent=2, width=140) | indent(4, True) }}
   delegate_apis:
     CreateProjectAndUser:
       default_region: {{ adjutant_service_region }}
@@ -102,15 +102,15 @@ workflow:
   action_defaults:
     NewProjectAction:
       default_roles:
-      {{ adjutant_role_mapping.project_admin | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_role_mapping.project_admin | to_nice_yaml(indent=2, width=140) | indent(8, True) }}
     NewProjectWithUserAction:
       default_roles:
-      {{ adjutant_role_mapping.project_admin | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_role_mapping.project_admin | to_nice_yaml(indent=2, width=140) | indent(8, True) }}
     AddDefaultUsersToProjectAction:
       default_users:
-      {{ adjutant_default_users_to_project_action | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_default_users_to_project_action | to_nice_yaml(indent=2, width=140) | indent(8, True) }}
       default_roles:
-      {{ adjutant_default_roles_to_project_action | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_default_roles_to_project_action | to_nice_yaml(indent=2, width=140) | indent(8, True) }}
     NewDefaultNetworkAction:
       region_defaults:
         network_name: default_network
@@ -259,8 +259,8 @@ workflow:
 
 quota:
   sizes:
-  {{ adjutant_quota_sizes | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_quota_sizes | to_nice_yaml(indent=2, width=140) | indent(4, True) }}
   sizes_ascending:
-  {{ adjutant_quota_sizes_asc | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_quota_sizes_asc | to_nice_yaml(indent=2, width=140) | indent(4, True) }}
   services:
-  {{ adjutant_quota_services | to_nice_yaml(indent=2, width=140) | indent(2, True) }}
+{{ adjutant_quota_services | to_nice_yaml(indent=2, width=140) | indent(4, True) }}
diff --git a/templates/wsgi.py.j2 b/templates/wsgi.py.j2
index a1c188f..7470bb3 100644
--- a/templates/wsgi.py.j2
+++ b/templates/wsgi.py.j2
@@ -14,19 +14,19 @@
 
 """
 WSGI config for Adjutant.
-
 It exposes the WSGI callable as a module-level variable named ``application``.
-
 For more information on this file, see
 https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
 """
 
 import os
+
 from django.core.wsgi import get_wsgi_application
-from django.conf import settings
-from urllib.parse import urlparse
+
 from keystonemiddleware.auth_token import AuthProtocol
 
+from adjutant.config import CONF
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "adjutant.settings")
 
 
@@ -34,16 +34,16 @@ application = get_wsgi_application()
 
 # Here we replace the default application with one wrapped by
 # the Keystone Auth Middleware.
-identity_url = urlparse(settings.KEYSTONE['auth_url'])
 conf = {
     "auth_plugin": "password",
-    'username': settings.KEYSTONE['username'],
-    'password': settings.KEYSTONE['password'],
-    'project_name': settings.KEYSTONE['project_name'],
-    "project_domain_id": settings.KEYSTONE.get('domain_id', "default"),
-    "user_domain_id": settings.KEYSTONE.get('domain_id', "default"),
-    "auth_url": settings.KEYSTONE['auth_url'],
-    'delay_auth_decision': True,
-    'include_service_catalog': False,
+    "username": CONF.identity.auth.username,
+    "password": CONF.identity.auth.password,
+    "project_name": CONF.identity.auth.project_name,
+    "project_domain_id": CONF.identity.auth.project_domain_id,
+    "user_domain_id": CONF.identity.auth.user_domain_id,
+    "auth_url": CONF.identity.auth.auth_url,
+    "delay_auth_decision": True,
+    "include_service_catalog": False,
+    "token_cache_time": CONF.identity.token_cache_time,
 }
 application = AuthProtocol(application, conf)