diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index b863283e1b..002116b400 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -174,9 +174,8 @@ def _get_engine_facade():
     global _engine_facade
 
     if not _engine_facade:
-        _engine_facade = db_session.EngineFacade(
-            CONF.database.connection,
-            **dict(six.iteritems(CONF.database)))
+        _engine_facade = db_session.EngineFacade.from_config(
+            CONF.database.connection, CONF)
 
     return _engine_facade