diff --git a/.bazeliskrc b/.bazeliskrc
index e874f97..e679d7f 100644
--- a/.bazeliskrc
+++ b/.bazeliskrc
@@ -1 +1 @@
-USE_BAZEL_VERSION=6.1.1
\ No newline at end of file
+USE_BAZEL_VERSION=7.1.2
\ No newline at end of file
diff --git a/.bazelrc b/.bazelrc
index 6da2dfe..e363e37 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -21,3 +21,6 @@
 
 build --copt=-Wno-unused-function --cxxopt="-std=c++17"
 build --host_copt=-Wno-unused-function --host_cxxopt="-std=c++17"
+# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
+# https://github.com/protocolbuffers/protobuf/issues/14313
+common --noenable_bzlmod
diff --git a/WORKSPACE b/WORKSPACE
index 4937898..ef793a5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -34,3 +34,8 @@
 load("@com_google_mpact-cheriot//:deps.bzl", "mpact_cheriot_deps");
 
 mpact_cheriot_deps()
+
+# Load the protobuf deps from mpact_sim
+load("@com_google_mpact-sim//:protobuf_deps.bzl", "mpact_sim_protobuf_deps")
+
+mpact_sim_protobuf_deps()
\ No newline at end of file
diff --git a/repos.bzl b/repos.bzl
index 805ef8c..448ddd6 100644
--- a/repos.bzl
+++ b/repos.bzl
@@ -22,7 +22,7 @@
     if not native.existing_rule("com_google_mpact-riscv"):
         http_archive(
             name = "com_google_mpact-riscv",
-            sha256 = "5764187b6a7817279422e7fe8b77dfd6813f826a54e9fea00c02f945f88f28a5",
-            strip_prefix = "mpact-riscv-31267652ea062c2031e1ff5043f43bbde7d3e37d",
-            url = "https://github.com/google/mpact-riscv/archive/31267652ea062c2031e1ff5043f43bbde7d3e37d.tar.gz",
+            sha256 = "d91789e6e8f9437b8f85ace33fe87b94eee510ee68c6c5e5174bec211a1cb29f",
+            strip_prefix = "mpact-riscv-d56ccd7b7ad310c32f0200bc51c022f435e00353",
+            url = "https://github.com/google/mpact-riscv/archive/d56ccd7b7ad310c32f0200bc51c022f435e00353.tar.gz",
         )