diff --git a/base/cvd/tools/bazel b/base/cvd/tools/bazel
index 55cdbbfec62..022d4b23124 100755
--- a/base/cvd/tools/bazel
+++ b/base/cvd/tools/bazel
@@ -41,7 +41,7 @@ if [ "${DISABLE_BAZEL_WRAPPER}" != "" ] \
 fi
 
 # Read the bazel version from .bazelversion file in the root of the repository
-BAZELVERSION_FILE_PATH="$(dirname $(readlink -f "$0"))/../.bazelversion"
+BAZELVERSION_FILE_PATH="$(dirname "$0")/../.bazelversion"
 VERSION_FROM_BAZELVERSION_FILE=$(cat ${BAZELVERSION_FILE_PATH})
 VERSION=${OVERRIDE_BAZEL_VERSION:-${VERSION_FROM_BAZELVERSION_FILE}}
 cat << EOF >&2
diff --git a/e2etests/.bazelversion b/e2etests/.bazelversion
index f9c71a52e2f..f7ee06693c1 100644
--- a/e2etests/.bazelversion
+++ b/e2etests/.bazelversion
@@ -1 +1 @@
-8.5.1
+9.0.0
diff --git a/e2etests/MODULE.bazel b/e2etests/MODULE.bazel
index 9f08161fed2..52a3b19beb0 100644
--- a/e2etests/MODULE.bazel
+++ b/e2etests/MODULE.bazel
@@ -1,5 +1,6 @@
-bazel_dep(name = "gazelle", version = "0.40.0")
-bazel_dep(name = "rules_go", version = "0.50.1")
+bazel_dep(name = "gazelle", version = "0.47.0")
+bazel_dep(name = "rules_go", version = "0.59.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
 go_sdk.download(version = "1.23.1")
diff --git a/e2etests/cvd/boot_tests.bzl b/e2etests/cvd/boot_tests.bzl
index 2aa8a2fbc5b..980c07a988d 100644
--- a/e2etests/cvd/boot_tests.bzl
+++ b/e2etests/cvd/boot_tests.bzl
@@ -1,8 +1,10 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
+
 def launch_cvd_boot_test(name, branch, target, credential_source = ""):
     args = ["-b", branch, "-t", target]
     if credential_source:
         args += ["-c", credential_source]
-    native.sh_test(
+    sh_test(
         name = name,
         size = "medium",
         srcs = ["launch_cvd_boot_test.sh"],
@@ -18,7 +20,7 @@ def cvd_load_boot_test(name, env_file, size = "medium", credential_source = ""):
     args = ["-e", "cvd/" + env_file]
     if credential_source:
         args += ["-c", credential_source]
-    native.sh_test(
+    sh_test(
         name = name,
         size = size,
         srcs = ["cvd_load_boot_test.sh"],
@@ -38,7 +40,7 @@ def cvd_command_boot_test(name, branch, target, cvd_command = [], credential_sou
     if substitutions:
         args += ["-s", ",".join(substitutions)]
     args += cvd_command
-    native.sh_test(
+    sh_test(
         name = name,
         size = "medium",
         srcs = ["cvd_command_boot_test.sh"],
@@ -54,7 +56,7 @@ def metrics_test(name, branch, target, credential_source = ""):
     args = ["-b", branch, "-t", target]
     if credential_source:
         args += ["-c", credential_source]
-    native.sh_test(
+    sh_test(
         name = name,
         size = "medium",
         srcs = ["metrics_test.sh"],
diff --git a/e2etests/orchestration/artifacts/BUILD.bazel b/e2etests/orchestration/artifacts/BUILD.bazel
index c3302616bde..59fa09d097c 100644
--- a/e2etests/orchestration/artifacts/BUILD.bazel
+++ b/e2etests/orchestration/artifacts/BUILD.bazel
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("def.bzl", "aosp_artifact")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 sh_binary(
     name = "fetch_aosp_artifact",