diff --git a/apps/emqx/src/emqx_alarm.erl b/apps/emqx/src/emqx_alarm.erl
index 412880bad..39d13cacd 100644
--- a/apps/emqx/src/emqx_alarm.erl
+++ b/apps/emqx/src/emqx_alarm.erl
@@ -221,7 +221,7 @@ handle_call(delete_all_deactivated_alarms, _From, State) ->
 
 handle_call({get_alarms, all}, _From, State) ->
     {atomic, Alarms} =
-        ekka_mnesia:ro_transaction(
+        mria:ro_transaction(
           ?COMMON_SHARD,
           fun() ->
                   [normalize(Alarm) ||
@@ -321,7 +321,7 @@ deactivate_all_alarms() ->
 
 %% Delete all records from the given table, ignore result.
 clear_table(TableName) ->
-    case ekka_mnesia:clear_table(TableName) of
+    case mria:clear_table(TableName) of
         {aborted, Reason} ->
             ?SLOG(warning, #{
                 msg => "fail_to_clear_table",
diff --git a/apps/emqx/src/emqx_trie.erl b/apps/emqx/src/emqx_trie.erl
index 1e3a0e5a5..327db16c0 100644
--- a/apps/emqx/src/emqx_trie.erl
+++ b/apps/emqx/src/emqx_trie.erl
@@ -329,6 +329,6 @@ do_compact_test() ->
                  do_compact(words(<<"a/+/+/+/+/b">>))),
     ok.
 
-clear_tables() -> ekka_mnesia:clear_table(?TRIE).
+clear_tables() -> mria:clear_table(?TRIE).
 
 -endif. % TEST
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
index 72115a80b..55cb8ffe5 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl
@@ -141,7 +141,7 @@ update_pwd(Username, Fun) ->
 -spec(lookup_user(binary()) -> [mqtt_admin()]).
 lookup_user(Username) when is_binary(Username) ->
     Fun = fun() -> mnesia:read(mqtt_admin, Username) end,
-    {atomic, User} = ekka_mnesia:ro_transaction(?DASHBOARD_SHARD, Fun),
+    {atomic, User} = mria:ro_transaction(?DASHBOARD_SHARD, Fun),
     User.
 
 -spec(all_users() -> [#mqtt_admin{}]).
diff --git a/apps/emqx_dashboard/src/emqx_dashboard_token.erl b/apps/emqx_dashboard/src/emqx_dashboard_token.erl
index 7d53ee06b..611ef44a2 100644
--- a/apps/emqx_dashboard/src/emqx_dashboard_token.erl
+++ b/apps/emqx_dashboard/src/emqx_dashboard_token.erl
@@ -135,7 +135,7 @@ do_destroy_by_username(Username) ->
 -spec(lookup(Token :: binary()) -> {ok, #mqtt_admin_jwt{}} | {error, not_found}).
 lookup(Token) ->
     Fun = fun() -> mnesia:read(?TAB, Token) end,
-    case ekka_mnesia:ro_transaction(?DASHBOARD_SHARD, Fun) of
+    case mria:ro_transaction(?DASHBOARD_SHARD, Fun) of
         {atomic, [JWT]} -> {ok, JWT};
         {atomic, []} -> {error, not_found}
     end.
@@ -143,7 +143,7 @@ lookup(Token) ->
 lookup_by_username(Username) ->
     Spec = [{{mqtt_admin_jwt, '_', Username, '_'}, [], ['$_']}],
     Fun = fun() -> mnesia:select(?TAB, Spec) end,
-    {atomic, List} = ekka_mnesia:ro_transaction(?DASHBOARD_SHARD, Fun),
+    {atomic, List} = mria:ro_transaction(?DASHBOARD_SHARD, Fun),
     List.
 
 
@@ -193,7 +193,7 @@ handle_info(clean_jwt, State) ->
     timer_clean(self()),
     Now = erlang:system_time(millisecond),
     Spec = [{{mqtt_admin_jwt, '_', '_', '$1'}, [{'<', '$1', Now}], ['$_']}],
-    {atomic, JWTList} = ekka_mnesia:ro_transaction(?DASHBOARD_SHARD,
+    {atomic, JWTList} = mria:ro_transaction(?DASHBOARD_SHARD,
         fun() -> mnesia:select(?TAB, Spec) end),
     destroy(JWTList),
     {noreply, State};
diff --git a/apps/emqx_gateway/test/emqx_sn_registry_SUITE.erl b/apps/emqx_gateway/test/emqx_sn_registry_SUITE.erl
index e727c6c88..04a3d8024 100644
--- a/apps/emqx_gateway/test/emqx_sn_registry_SUITE.erl
+++ b/apps/emqx_gateway/test/emqx_sn_registry_SUITE.erl
@@ -49,7 +49,7 @@ init_per_testcase(_TestCase, Config) ->
 
 end_per_testcase(_TestCase, Config) ->
     {Tab, _Pid} = proplists:get_value(reg, Config),
-    ekka_mnesia:clear_table(Tab),
+    mria:clear_table(Tab),
     Config.
 
 %%--------------------------------------------------------------------
diff --git a/apps/emqx_machine/src/emqx_cluster_rpc.erl b/apps/emqx_machine/src/emqx_cluster_rpc.erl
index 0d963a2de..0d93805b7 100644
--- a/apps/emqx_machine/src/emqx_cluster_rpc.erl
+++ b/apps/emqx_machine/src/emqx_cluster_rpc.erl
@@ -150,8 +150,8 @@ handle_continue(?CATCH_UP, State) ->
     {noreply, State, catch_up(State)}.
 
 handle_call(reset, _From, State) ->
-    _ = ekka_mnesia:clear_table(?CLUSTER_COMMIT),
-    _ = ekka_mnesia:clear_table(?CLUSTER_MFA),
+    _ = mria:clear_table(?CLUSTER_COMMIT),
+    _ = mria:clear_table(?CLUSTER_MFA),
     {reply, ok, State, {continue, ?CATCH_UP}};
 
 handle_call({initiate, MFA}, _From, State = #{node := Node}) ->
diff --git a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl
index e3d90fe7d..456ee6a9a 100644
--- a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl
+++ b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl
@@ -157,7 +157,7 @@ match_messages(_, Topic, Cursor) ->
     end.
 
 clean(_) ->
-    ekka_mnesia:clear_table(?TAB),
+    mria:clear_table(?TAB),
     ok.
 %%--------------------------------------------------------------------
 %% Internal functions