diff --git a/.bazeliskrc b/.bazeliskrc
new file mode 100644
index 000000000..773a4f4c6
--- /dev/null
+++ b/.bazeliskrc
@@ -0,0 +1 @@
+USE_BAZEL_VERSION=6.x
diff --git a/.bazelversion b/.bazelversion
deleted file mode 100644
index f9da12e11..000000000
--- a/.bazelversion
+++ /dev/null
@@ -1 +0,0 @@
-6.3.2
\ No newline at end of file
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index 61f5861f5..64ede07d1 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -16,3 +16,5 @@ jobs:
     - uses: actions/checkout@v4
     - run: bazelisk test --config=ci ...
       working-directory: test
+      env:
+        USE_BAZEL_VERSION: 6.x
diff --git a/WORKSPACE b/WORKSPACE
new file mode 100644
index 000000000..e69de29bb
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index e69de29bb..600260da4 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -0,0 +1 @@
+# SEE MODULE.bazel