diff --git a/.bazeliskrc b/.bazeliskrc
index 72fbf2d..7c75a11 100644
--- a/.bazeliskrc
+++ b/.bazeliskrc
@@ -1 +1 @@
-USE_BAZEL_VERSION=5.3.0
+USE_BAZEL_VERSION=7.0.0rc5
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 760ff17..e4bb819 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-2019]
         bazel_mode: [workspace, module]
-        version: ["5.3.0", "6.0.0"]
+        version: ["5.3.0", "6.0.0", "7.0.0rc5"]
         exclude:
           - version: 5.3.0
             bazel_mode: module
diff --git a/MODULE.bazel b/MODULE.bazel
index d36ec60..6b944b9 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -3,12 +3,13 @@ module(
     version = "0.3.0",
     compatibility_level = 0,
 )
+
 bazel_dep(name = "bazel_skylib", version = "1.2.1")
-bazel_dep(name = "platforms", version = "0.0.5")
-bazel_dep(name = "stardoc", version = "0.5.1", repo_name = "io_bazel_stardoc", dev_dependency = True)
+bazel_dep(name = "platforms", version = "0.0.8")
 
-sh_configure = use_extension("//bzlmod:extensions.bzl", "sh_configure")
+bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
+sh_configure = use_extension("//bzlmod:extensions.bzl", "sh_configure")
 use_repo(sh_configure, "local_posix_config", "rules_sh_shim_exe")
 
 register_toolchains("@local_posix_config//...")
diff --git a/sh/posix.bzl b/sh/posix.bzl
index 2e52784..e41543f 100644
--- a/sh/posix.bzl
+++ b/sh/posix.bzl
@@ -179,15 +179,16 @@ toolchain(
             if cmd_path
         ]),
         arch = {
-            "darwin_arm64": "arm64",
-            "arm64_windows": "arm64",
             "aarch64": "arm64",
+            "arm64_windows": "arm64",
+            "darwin_arm64": "arm64",
         }.get(cpu, "x86_64"),
         os = {
+            "arm64_windows": "windows",
             "darwin": "osx",
             "darwin_arm64": "osx",
+            "darwin_x86_64": "osx",
             "x64_windows": "windows",
-            "arm64_windows": "windows",
         }.get(cpu, "linux"),
         toolchain_type = TOOLCHAIN_TYPE,
     ))