diff --git a/MODULE.bazel b/MODULE.bazel
index 87b6dab798..65523ff87d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -4,29 +4,23 @@ module(
     repo_name = "io_opentelemetry_cpp",
 )
 
-bazel_dep(name = "curl", version = "8.8.0")
 bazel_dep(name = "abseil-cpp", version = "20240116.2")
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.8")
-
-bazel_dep(name = "rules_pkg", version = "1.0.1", dev_dependency = True)
-
-bazel_dep(name = "rules_python", version = "0.34.0")
-bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "platforms", version = "0.0.10")
-
+bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3")
+bazel_dep(name = "curl", version = "8.8.0")
+bazel_dep(name = "depend_on_what_you_use", version = "0.4.0")
 bazel_dep(name = "google_benchmark", version = "1.8.4", dev_dependency = True)
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True)
-
+bazel_dep(name = "grpc", version = "1.65.0", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "nlohmann_json", version = "3.11.3")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_cc", version = "0.0.9")
+bazel_dep(name = "rules_pkg", version = "1.0.1", dev_dependency = True)
+bazel_dep(name = "rules_proto", version = "6.0.2")
+bazel_dep(name = "rules_python", version = "0.34.0")
+bazel_dep(name = "zlib", version = "1.3.1.bcr.1")
 
-# Still needs repo_name="com_github_grpc_grpc" due to
-#
-#   ERROR: no such package '@@[unknown repo 'com_github_grpc_grpc' requested from @@]//src/compiler':
-#           The repository '@@[unknown repo 'com_github_grpc_grpc' requested from @@]' could not be resolved:
-#                 No repository visible as '@com_github_grpc_grpc' from main repository
-#
-bazel_dep(name = "grpc", version = "1.65.0", repo_name = "com_github_grpc_grpc")
 bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
 archive_override(
     module_name = "opentelemetry-proto",
@@ -46,9 +40,10 @@ archive_override(
     urls = "https://github.com/jupp0r/prometheus-cpp/archive/6492e820cdff7e7345d46d82b43735aaea542098.zip",
 )
 
-bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3")
-bazel_dep(name = "zlib", version = "1.3.1.bcr.1")
-bazel_dep(name = "rules_proto", version = "6.0.2")
+use_repo(
+    use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension"),
+    "local_config_cc",
+)
 
 use_repo(
     use_extension("//bazel:repository.bzl", "deps1"),
@@ -60,17 +55,3 @@ use_repo(
     "sentry_cli_windows_amd64",
     "tempo_w64",
 )
-
-cc_configure = use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension")
-use_repo(cc_configure, "local_config_cc")
-
-python = use_extension("@rules_python//python/extensions:python.bzl", "python")
-python.toolchain(
-    # The only reason we explicitly load `rules_python` is to make ignore_root_user_error = True
-    # This allows it to run on cloud clients, where root is the user.
-    ignore_root_user_error = True,
-    is_default = True,
-    python_version = "3.12",
-)
-
-bazel_dep(name = "depend_on_what_you_use", version = "0.4.0")