diff --git a/.bazelrc b/.bazelrc
index 2a1c6ed1f..20b03e388 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1 +1,4 @@
-coverage --experimental_ui_max_stdouterr_bytes=10485760
\ No newline at end of file
+# TODO: remove with bazel 7.x
+common --enable_bzlmod
+
+coverage --experimental_ui_max_stdouterr_bytes=10485760
diff --git a/.bazelversion b/.bazelversion
index 4ac4fded4..19b860c18 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.2.0
\ No newline at end of file
+6.4.0
diff --git a/MODULE.bazel b/MODULE.bazel
new file mode 100644
index 000000000..d05d4ad36
--- /dev/null
+++ b/MODULE.bazel
@@ -0,0 +1,9 @@
+module(name = "maplibre")
+
+bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "rules_apple", version = "3.1.1", repo_name = "build_bazel_rules_apple")
+bazel_dep(name = "rules_swift", version = "1.13.0", repo_name = "build_bazel_rules_swift")
+bazel_dep(name = "rules_xcodeproj", version = "1.13.0")
+
+provisioning_profile_repository = use_extension("@build_bazel_rules_apple//apple:apple.bzl", "provisioning_profile_repository_extension")
+provisioning_profile_repository.setup()
diff --git a/WORKSPACE b/WORKSPACE
index 640e8eda8..e69de29bb 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,63 +0,0 @@
-workspace(name = "Maplibre")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "build_bazel_rules_apple",
-    sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz",
-)
-
-http_archive(
-    name = "rules_xcodeproj",
-    sha256 = "f5c1f4bea9f00732ef9d54d333d9819d574de7020dbd9d081074232b93c10b2c",
-    url = "https://github.com/MobileNativeFoundation/rules_xcodeproj/releases/download/1.13.0/release.tar.gz",
-)
-
-load(
-    "@rules_xcodeproj//xcodeproj:repositories.bzl",
-    "xcodeproj_rules_dependencies",
-)
-
-xcodeproj_rules_dependencies()
-
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
-
-bazel_features_deps()
-
-load(
-    "@build_bazel_rules_apple//apple:repositories.bzl",
-    "apple_rules_dependencies",
-)
-
-apple_rules_dependencies()
-
-load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
-)
-
-swift_rules_dependencies()
-
-load(
-    "@build_bazel_rules_swift//swift:extras.bzl",
-    "swift_rules_extra_dependencies",
-)
-
-swift_rules_extra_dependencies()
-
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
-
-load(
-    "@build_bazel_rules_apple//apple:apple.bzl",
-    "provisioning_profile_repository"
-)
-
-provisioning_profile_repository(
-    name = "local_provisioning_profiles"
-)