diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index e865851afdcfb3..a3eea14ec5e52b 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -79,6 +79,9 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
     include_json_profile:
       - build
       - test
@@ -146,6 +149,9 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
     include_json_profile:
       - build
       - test
@@ -185,6 +191,18 @@ tasks:
       - "//tools/python/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # Disable test failing due to infra change
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
+      - "-//tools/python:pywrapper_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
+      - "-//src/test/py/bazel:runfiles_test"
+      - "-//src/test/shell/bazel:jdeps_test"
+      - "-//src/test/shell/bazel:python_version_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
     include_json_profile:
       - build
       - test
@@ -249,6 +267,9 @@ tasks:
       - "-//src/test/java/com/google/devtools/build/lib/remote/..."
       - "-//src/test/shell/bazel/remote/..."
       - "-//tools/python:pywrapper_test"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
     include_json_profile:
       - build
       - test
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 845c7b53f69871..df1c4bb017f6f1 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -80,6 +80,9 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
   ubuntu1804_clang:
     platform: ubuntu1804
     environment:
@@ -143,6 +146,9 @@ tasks:
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
   macos:
     xcode_version: "13.0"
     shards: 5
@@ -184,6 +190,18 @@ tasks:
       - "-//src/java_tools/import_deps_checker/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # Disable test failing due to infra change
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
+      - "-//tools/python:pywrapper_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
+      - "-//src/test/py/bazel:runfiles_test"
+      - "-//src/test/shell/bazel:jdeps_test"
+      - "-//src/test/shell/bazel:python_version_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
   windows:
     shards: 4
     batch_commands:
@@ -247,6 +265,9 @@ tasks:
       - "-//src/test/java/com/google/devtools/build/lib/remote/..."
       - "-//src/test/shell/bazel/remote/..."
       - "-//tools/python:pywrapper_test"
+      # Disable test failing due to infra change
+      - "-//src/test/shell/bazel:git_repository_test"
+      - "-//src/test/shell/bazel:starlark_git_repository_test"
   rbe_ubuntu1804:
     platform: ubuntu1804
     shell_commands:
diff --git a/.bazelversion b/.bazelversion
new file mode 100644
index 00000000000000..8a30e8f94a3929
--- /dev/null
+++ b/.bazelversion
@@ -0,0 +1 @@
+5.4.0
diff --git a/BUILD b/BUILD
index 177abad8a4d0d2..20907911305d29 100644
--- a/BUILD
+++ b/BUILD
@@ -28,7 +28,7 @@ filegroup(
         "//tools:srcs",
         "//third_party:srcs",
         "//src/main/starlark/tests/builtins_bzl:srcs",
-    ] + glob([".bazelci/*"]) + [".bazelrc"],
+    ] + glob([".bazelci/*"]) + [".bazelrc", ".bazelversion"],
     visibility = ["//src/test/shell/bazel:__pkg__"],
 )