diff --git a/MODULE.bazel b/MODULE.bazel
index f99bb87f3977..9ea6d4319cc5 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -292,11 +292,11 @@ erlang_package.hex_package(
     version = "1.4.1",
 )
 
-erlang_package.hex_package(
+erlang_package.git_package(
     name = "khepri",
     build_file = "@rabbitmq-server//bazel:BUILD.khepri",
-    sha256 = "da618ec76abd188620c8fbdc16cb8eb94b09055a657c488da7fab160d49abcbe",
-    version = "0.10.1",
+    commit = "f02a92b9a3cf147df2fead244d13d83b9e618f55",
+    repository = "rabbitmq/khepri",
 )
 
 erlang_package.git_package(
diff --git a/bazel/BUILD.khepri b/bazel/BUILD.khepri
index 453afbd2100f..039d1cedcf7b 100644
--- a/bazel/BUILD.khepri
+++ b/bazel/BUILD.khepri
@@ -52,6 +52,7 @@ filegroup(
         "src/khepri_export_erlang.erl",
         "src/khepri_import_export.erl",
         "src/khepri_machine.erl",
+        "src/khepri_mfa.erl",
         "src/khepri_path.erl",
         "src/khepri_pattern_tree.erl",
         "src/khepri_payload.erl",
@@ -73,6 +74,7 @@ filegroup(
         "src/khepri_error.hrl",
         "src/khepri_evf.hrl",
         "src/khepri_machine.hrl",
+        "src/khepri_mfa.hrl",
         "src/khepri_payload.hrl",
         "src/khepri_projection.hrl",
         "src/khepri_ret.hrl",
@@ -148,6 +150,7 @@ erlang_bytecode(
         "src/khepri_evf.erl",
         "src/khepri_export_erlang.erl",
         "src/khepri_machine.erl",
+        "src/khepri_mfa.erl",
         "src/khepri_path.erl",
         "src/khepri_pattern_tree.erl",
         "src/khepri_payload.erl",
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 009e5acfce94..42799cd585d6 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -115,7 +115,7 @@ dep_accept = hex 0.3.5
 dep_cowboy = hex 2.10.0
 dep_cowlib = hex 2.12.1
 dep_credentials_obfuscation = hex 3.4.0
-dep_khepri = hex 0.10.0
+dep_khepri = git https://github.com/rabbitmq/khepri.git replace-funs-by-mfa-in-ra-queries
 dep_khepri_mnesia_migration = hex 0.2.1
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main
 dep_prometheus = hex 4.11.0