diff --git a/zun/db/sqlalchemy/api.py b/zun/db/sqlalchemy/api.py
index 596b8fdb8..44a83e376 100644
--- a/zun/db/sqlalchemy/api.py
+++ b/zun/db/sqlalchemy/api.py
@@ -45,6 +45,9 @@ _FACADE = None
 def _create_facade_lazily():
     global _FACADE
     if _FACADE is None:
+        # FIXME(hongbin): we need to remove reliance on autocommit semantics
+        # ASAP since it's not compatible with SQLAlchemy 2.0
+        db_session.enginefacade.configure(__autocommit=True)
         _FACADE = db_session.enginefacade.get_legacy_facade()
         if profiler_sqlalchemy:
             if CONF.profiler.enabled and CONF.profiler.trace_sqlalchemy: