diff --git a/.gitignore b/.gitignore
index b0d9d52e..0b9ba198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ CTestTestfile.cmake
 _deps
 
 ### Bazel ###
+# Ignore the lock file
+MODULE.bazel.lock
 # Ignore backup files.
 *~
 # Ignore Vim swap files.
diff --git a/MODULE.bazel b/MODULE.bazel
new file mode 100644
index 00000000..f4e7e30f
--- /dev/null
+++ b/MODULE.bazel
@@ -0,0 +1,36 @@
+module(
+    name = "fixed-containers",
+)
+
+bazel_dep(name = "magic_enum", repo_name = "com_github_neargye_magic_enum")
+archive_override(
+    module_name = "magic_enum",
+    integrity = "sha256-mysXiN1lH+q4i8/7Cyrj3tTCcUKildbt6ILI/IoyejU=",
+    strip_prefix = "magic_enum-d63a9d63717640705c6c9654d68fa6575d39bab8",
+    urls = ["https://github.com/Neargye/magic_enum/archive/d63a9d63717640705c6c9654d68fa6575d39bab8.tar.gz"],
+)
+
+bazel_dep(name = "googletest", dev_dependency = True, repo_name = "com_google_googletest")
+archive_override(
+    module_name = "googletest",
+    integrity = "sha256-WSQxGdI8Gbrxi7QGRkTliUsVaxW9AZHqMEbbnEp+4Ow=",
+    strip_prefix = "googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7",
+    urls = ["https://github.com/google/googletest/archive/eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.tar.gz"],
+)
+
+bazel_dep(name = "google_benchmark", dev_dependency = True, repo_name = "com_google_benchmark")
+archive_override(
+    module_name = "google_benchmark",
+    integrity = "sha256-3xI14ONyl+mQu4M8cjzT3sYfyVxJUfZL3Vxy0c6n9Pk=",
+    strip_prefix = "benchmark-447752540c71f34d5d71046e08192db181e9b02b",
+    urls = ["https://github.com/google/benchmark/archive/447752540c71f34d5d71046e08192db181e9b02b.tar.gz"],
+)
+
+bazel_dep(name = "range-v3", dev_dependency = True, repo_name = "com_github_ericniebler_range-v3")
+archive_override(
+    module_name = "range-v3",
+    integrity = "sha256-Kj6VbMAXTqiD02xRre2FSa8QB4VYF36PbXbF4z3pUME=",
+    strip_prefix = "range-v3-53c40dd628450c977ee1558285ff43e0613fa7a9",
+    urls = ["https://github.com/ericniebler/range-v3/archive/53c40dd628450c977ee1558285ff43e0613fa7a9.tar.gz"],
+    patches = ["//:patches/range-v3_bzlmod.patch",],
+)
diff --git a/README.md b/README.md
index f3adfd34..274f1e5d 100644
--- a/README.md
+++ b/README.md
@@ -343,7 +343,17 @@ target_link_libraries(<your_binary> fixed_containers::fixed_containers)
 ```
 
 ### bazel
-Use the following in your `WORKSPACE` file:
+If you are managing dependencies with the newer bzlmod system, use the following in your `MODULE.bazel` file:
+```
+bazel_dep(name = "fixed_containers")
+archive_override(
+    module_name = "fixed_containers",
+    strip_prefix = "fixed-containers-<commit>",
+    urls = ["https://github.com/teslamotors/fixed-containers/archive/<commit>.tar.gz"],
+)
+```
+
+If you are managing dependencies with the older `WORKSPACE` system, use the following in your `WORKSPACE` file:
 ```
 http_archive(
     name = "fixed_containers",
diff --git a/WORKSPACE b/WORKSPACE
deleted file mode 100644
index cc44986c..00000000
--- a/WORKSPACE
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-load("//:fixed_containers_deps.bzl", "fixed_containers_deps")
-fixed_containers_deps()
-
-http_archive(
-    name = "com_google_googletest",
-    urls = ["https://github.com/google/googletest/archive/eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.tar.gz"],
-    strip_prefix = "googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7",
-    sha256 = "59243119d23c19baf18bb4064644e5894b156b15bd0191ea3046db9c4a7ee0ec",
-)
-
-http_archive(
-    name = "com_google_benchmark",
-    urls = ["https://github.com/google/benchmark/archive/447752540c71f34d5d71046e08192db181e9b02b.tar.gz"],
-    strip_prefix = "benchmark-447752540c71f34d5d71046e08192db181e9b02b",
-    sha256 = "df1235e0e37297e990bb833c723cd3dec61fc95c4951f64bdd5c72d1cea7f4f9",
-)
-
-http_archive(
-    name = "com_github_ericniebler_range-v3",
-    urls = ["https://github.com/ericniebler/range-v3/archive/53c40dd628450c977ee1558285ff43e0613fa7a9.tar.gz"],
-    strip_prefix = "range-v3-53c40dd628450c977ee1558285ff43e0613fa7a9",
-    sha256 = "2a3e956cc0174ea883d36c51aded8549af10078558177e8f6d76c5e33de950c1",
-)
diff --git a/patches/range-v3_bzlmod.patch b/patches/range-v3_bzlmod.patch
new file mode 100644
index 00000000..fe3555cb
--- /dev/null
+++ b/patches/range-v3_bzlmod.patch
@@ -0,0 +1,10 @@
+diff --git a/MODULE.bazel b/MODULE.bazel
+new file mode 100644
+index 0000000..2a3ae781c
+--- /dev/null
++++ MODULE.bazel
+@@ -0,0 +1,3 @@
++module(
++    name = "range-v3",
++)
+