diff --git a/hooks/keystone_context.py b/hooks/keystone_context.py
index 9c5cb384b7e2a897610e97b73a597ed62074cfcb..5645ab5640f67e7816b07ddf518c985c71924540 100644
--- a/hooks/keystone_context.py
+++ b/hooks/keystone_context.py
@@ -281,6 +281,10 @@ class KeystoneContext(context.OSContextGenerator):
             resolve_address(ADMIN),
             api_port('keystone-admin')).replace('v2.0', '')
 
+        ctxt['enable_oidc'] = config('enable-oidc')
+        ctxt['enable_saml2'] = config('enable-saml2')
+        ctxt['trusted_dashboard'] = config('trusted-dashboard')
+
         return ctxt
 
 
@@ -291,7 +295,6 @@ class SamlContext(context.OSContextGenerator):
             api_port, endpoint_url, resolve_address, PUBLIC,
         )
         ctxt = {}
-        ctxt['trusted_dashboard'] = config('trusted-dashboard')
 
         enable_saml2 = config('enable-saml2')
         if enable_saml2:
@@ -434,7 +437,6 @@ class OidcContext(context.OSContextGenerator):
                     resolve_address(PUBLIC), api_port('keystone-public'),
                     '/v3/auth/OS-FEDERATION/websso/oidc/redirect'),
             }
-        ctxt['trusted_dashboard'] = config('trusted-dashboard')
         return ctxt
 
 
diff --git a/hooks/keystone_utils.py b/hooks/keystone_utils.py
index 1ea356dcb2566e06b966c4ff8549e93ad9b7fbd8..18065918d6c906c4c739c6be6ea9cf958591ae14 100644
--- a/hooks/keystone_utils.py
+++ b/hooks/keystone_utils.py
@@ -476,6 +476,7 @@ def resource_map():
                                                 admin_script=admin_script,
                                                 public_script=public_script),
                 keystoneContext,
+                samlContext,
                 keystone_context.OidcContext()],
             'services': ['apache2']
         }