diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index 1d81d386df..b53f63db48 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -45,7 +45,7 @@ jobs:
       bazel-args: >-
         --config=ci
         ${{ matrix.mode == 'bzlmod'
-            && '--enable_bzlmod'
+            && '--enable_bzlmod --noenable_workspace'
             || '' }}
       bazel-mode: ${{ matrix.mode }}
       bazel-path: bazel
@@ -80,7 +80,7 @@ jobs:
       bazel-args: >-
         --config=ci
         ${{ matrix.mode == 'bzlmod'
-            && '--enable_bzlmod'
+            && '--enable_bzlmod --noenable_workspace'
             || '' }}
       bazel-path: bazel
       bazel-mode: ${{ matrix.mode }}
@@ -111,7 +111,7 @@ jobs:
         --config=ci
         --config=gcc
         ${{ matrix.mode == 'bzlmod'
-            && '--enable_bzlmod'
+            && '--enable_bzlmod --noenable_workspace'
             || '' }}
       bazel-mode: ${{ matrix.mode }}-gcc
       bazel-path: bazel
@@ -165,7 +165,7 @@ jobs:
         --config=ci
         --config=macos
         ${{ (steps.rbe.outputs.authorized == 'true' || github.event_name != 'pull_request') && '--config=rbe-cache-only' || '' }}
-        ${{ matrix.mode == 'bzlmod' && '--enable_bzlmod' || '' }}
+        ${{ matrix.mode == 'bzlmod' && '--enable_bzlmod --noenable_workspace' || '' }}
         //...
       working-directory: bazel
       env:
diff --git a/bazel/.bazelrc b/bazel/.bazelrc
index 5070d7f5b0..eb3cbf4405 100644
--- a/bazel/.bazelrc
+++ b/bazel/.bazelrc
@@ -8,6 +8,7 @@ run --color=yes
 build --color=yes
 
 common --noenable_bzlmod
+common --enable_workspace
 common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 common --@rules_python//python/config_settings:bootstrap_impl=script
 
diff --git a/bazel/.bazelversion b/bazel/.bazelversion
index 5942a0d3a0..df5119ec64 100644
--- a/bazel/.bazelversion
+++ b/bazel/.bazelversion
@@ -1 +1 @@
-7.7.1
+8.7.0