diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index cfa0d90314b24d..144c46cea6b97f 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -231,6 +231,7 @@ tasks:
       - build
       - test
   macos_arm64:
+    xcode_version: "15.1"
     shell_commands:
       - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
         android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 4ecbd214998351..29b9f793089cb7 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -236,6 +236,7 @@ tasks:
       - test
   macos_arm64:
     shards: 2
+    xcode_version: "15.1"
     shell_commands:
       - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
         android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
diff --git a/bazel_downloader.cfg b/bazel_downloader.cfg
index efa65d2e9c3c32..99a15d355ebec0 100644
--- a/bazel_downloader.cfg
+++ b/bazel_downloader.cfg
@@ -1,2 +1,6 @@
 rewrite (github.com)/(.*) https://mirror.bazel.build/$1/$2
 rewrite (github.com)/(.*) https://$1/$2
+rewrite (maven.google.com)/(.*) https://mirror.bazel.build/$1/$2
+rewrite (maven.google.com)/(.*) https://$1/$2
+rewrite (cdn.azul.com)/(.*) https://mirror.bazel.build/$1/$2
+rewrite (cdn.azul.com)/(.*) https://$1/$2
diff --git a/src/test/java/com/google/devtools/build/lib/server/BUILD b/src/test/java/com/google/devtools/build/lib/server/BUILD
index f2dba006357341..894201ab0786ae 100644
--- a/src/test/java/com/google/devtools/build/lib/server/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/server/BUILD
@@ -49,6 +49,7 @@ java_library(
 java_test(
     name = "ServerTests",
     size = "medium",
+    tags = ["requires-network"],  # https://github.com/bazelbuild/bazel/issues/20743
     test_class = "com.google.devtools.build.lib.AllTests",
     runtime_deps = [
         ":ServerTests_lib",
diff --git a/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
index eea2ac4156770e..2d5d4704157823 100644
--- a/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/BUILD
@@ -27,6 +27,7 @@ java_test(
     name = "StarlarkDebugServerTest",
     size = "medium",
     srcs = ["StarlarkDebugServerTest.java"],
+    tags = ["requires-network"],  # https://github.com/bazelbuild/bazel/issues/20743
     deps = [
         ":utils",
         "//src/main/java/com/google/devtools/build/lib/events",
@@ -45,6 +46,7 @@ java_test(
 java_test(
     name = "DebugServerTransportTest",
     srcs = ["DebugServerTransportTest.java"],
+    tags = ["requires-network"],  # https://github.com/bazelbuild/bazel/issues/20743
     deps = [
         "//src/main/java/com/google/devtools/build/lib/events",
         "//src/main/java/com/google/devtools/build/lib/starlarkdebug/proto:starlark_debugging_java_proto",