diff --git a/WORKSPACE b/WORKSPACE
index 73ba6b4b64c..b7c764a4869 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -85,29 +85,32 @@ pip_parse(
 
 http_archive(
     name = "build_bazel_rules_swift",
-    sha256 = "12057b7aa904467284eee640de5e33853e51d8e31aae50b3fb25d2823d51c6b8",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/1.0.0/rules_swift.1.0.0.tar.gz",
-)
-
-http_archive(
-    name = "rules_pods",
-    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/4.1.0-412495/PodToBUILD.zip"],
+    sha256 = "bf2861de6bf75115288468f340b0c4609cc99cc1ccc7668f0f71adfd853eedb3",
+    url = "https://github.com/bazelbuild/rules_swift/releases/download/1.7.1/rules_swift.1.7.1.tar.gz",
 )
 
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
 )
-load(
-    "@rules_pods//BazelExtensions:workspace.bzl",
-    "new_pod_repository",
-)
 
 swift_rules_dependencies()
 
-new_pod_repository(
-    name = "CronetFramework",
-    is_dynamic_framework = True,
-    podspec_url = "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/2/e/1/CronetFramework/0.0.5/CronetFramework.podspec.json",
-    url = "https://storage.googleapis.com/grpc-precompiled-binaries/cronet/Cronet.framework-v0.0.5.zip",
-)
+# TODO: Enable below once https://github.com/bazel-xcode/PodToBUILD/issues/232 is resolved
+#
+#http_archive(
+#    name = "rules_pods",
+#    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/4.1.0-412495/PodToBUILD.zip"],
+#)
+#
+#load(
+#    "@rules_pods//BazelExtensions:workspace.bzl",
+#    "new_pod_repository",
+#)
+#
+#new_pod_repository(
+#    name = "CronetFramework",
+#    is_dynamic_framework = True,
+#    podspec_url = "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/2/e/1/CronetFramework/0.0.5/CronetFramework.podspec.json",
+#    url = "https://storage.googleapis.com/grpc-precompiled-binaries/cronet/Cronet.framework-v0.0.5.zip",
+#)
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index a914c119d2c..e002cbfe89c 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -292,12 +292,11 @@ def grpc_deps():
     if "rules_cc" not in native.existing_rules():
         http_archive(
             name = "rules_cc",
-            sha256 = "35f2fb4ea0b3e61ad64a369de284e4fbbdcdba71836a5555abb5e194cf119509",
-            strip_prefix = "rules_cc-624b5d59dfb45672d4239422fa1e3de1822ee110",
+            sha256 = "3d9e271e2876ba42e114c9b9bc51454e379cbf0ec9ef9d40e2ae4cec61a31b40",
+            strip_prefix = "rules_cc-0.0.6",
             urls = [
-                #2019-08-15
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_cc/archive/624b5d59dfb45672d4239422fa1e3de1822ee110.tar.gz",
-                "https://github.com/bazelbuild/rules_cc/archive/624b5d59dfb45672d4239422fa1e3de1822ee110.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
+                "https://github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
             ],
         )
 
@@ -425,20 +424,20 @@ def grpc_deps():
     if "build_bazel_rules_apple" not in native.existing_rules():
         http_archive(
             name = "build_bazel_rules_apple",
-            sha256 = "77e8bf6fda706f420a55874ae6ee4df0c9d95da6c7838228b26910fc82eea5a2",
+            sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
-                "https://github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz",
+                "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz",
             ],
         )
 
     if "build_bazel_apple_support" not in native.existing_rules():
         http_archive(
             name = "build_bazel_apple_support",
-            sha256 = "76df040ade90836ff5543888d64616e7ba6c3a7b33b916aa3a4b68f342d1b447",
+            sha256 = "f4fdf5c9b42b92ea12f229b265d74bb8cedb8208ca7a445b383c9f866cf53392",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz",
-                "https://github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/1.3.1/apple_support.1.3.1.tar.gz",
+                "https://github.com/bazelbuild/apple_support/releases/download/1.3.1/apple_support.1.3.1.tar.gz",
             ],
         )
 
diff --git a/bazel/supported_versions.txt b/bazel/supported_versions.txt
index a969c230710..713850da4df 100644
--- a/bazel/supported_versions.txt
+++ b/bazel/supported_versions.txt
@@ -1,2 +1,2 @@
-6.1.1
-5.4.0
+6.1.2
+5.4.1
diff --git a/bazel/update_mirror.sh b/bazel/update_mirror.sh
index 9018b2a3e45..40ee88ab98a 100755
--- a/bazel/update_mirror.sh
+++ b/bazel/update_mirror.sh
@@ -57,25 +57,13 @@ function upload {
 # upload "github.com/google/boringssl/archive/1c2769383f027befac5b75b6cedd25daf3bf4dcf.tar.gz"
 
 # bazel binaries used by the tools/bazel wrapper script
-upload github.com/bazelbuild/bazel/releases/download/1.0.0/bazel-1.0.0-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/1.0.0/bazel-1.0.0-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/1.0.0/bazel-1.0.0-windows-x86_64.exe
+upload github.com/bazelbuild/bazel/releases/download/5.4.1/bazel-5.4.1-linux-x86_64
+upload github.com/bazelbuild/bazel/releases/download/5.4.1/bazel-5.4.1-darwin-x86_64
+upload github.com/bazelbuild/bazel/releases/download/5.4.1/bazel-5.4.1-windows-x86_64.exe
 
-upload github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-windows-x86_64.exe
-
-upload github.com/bazelbuild/bazel/releases/download/3.7.1/bazel-3.7.1-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/3.7.1/bazel-3.7.1-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/3.7.1/bazel-3.7.1-windows-x86_64.exe
-
-upload github.com/bazelbuild/bazel/releases/download/4.2.1/bazel-4.2.1-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/4.2.1/bazel-4.2.1-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/4.2.1/bazel-4.2.1-windows-x86_64.exe
-
-upload github.com/bazelbuild/bazel/releases/download/5.3.0/bazel-5.3.0-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/5.3.0/bazel-5.3.0-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/5.3.0/bazel-5.3.0-windows-x86_64.exe
+upload github.com/bazelbuild/bazel/releases/download/6.1.2/bazel-6.1.2-linux-x86_64
+upload github.com/bazelbuild/bazel/releases/download/6.1.2/bazel-6.1.2-darwin-x86_64
+upload github.com/bazelbuild/bazel/releases/download/6.1.2/bazel-6.1.2-windows-x86_64.exe
 
 # Collect the github archives to mirror from grpc_deps.bzl
 grep -o '"https://github.com/[^"]*"' bazel/grpc_deps.bzl | sed 's/^"https:\/\///' | sed 's/"$//' | while read -r line ; do
diff --git a/doc/bazel_support.md b/doc/bazel_support.md
index 337cf5bc767..b914c794b1f 100644
--- a/doc/bazel_support.md
+++ b/doc/bazel_support.md
@@ -39,5 +39,5 @@ recent LTS versions of Bazel. However individual releases may have a broader
 compatibility range. The currently supported versions are captured by the
 following list:
 
-- [`6.1.1`](https://github.com/bazelbuild/bazel/releases/tag/6.1.1)
-- [`5.4.0`](https://github.com/bazelbuild/bazel/releases/tag/5.4.0)
+- [`6.1.2`](https://github.com/bazelbuild/bazel/releases/tag/6.1.2)
+- [`5.4.1`](https://github.com/bazelbuild/bazel/releases/tag/5.4.1)
diff --git a/src/objective-c/BUILD b/src/objective-c/BUILD
index 0a9fdba7ad7..79509248d67 100644
--- a/src/objective-c/BUILD
+++ b/src/objective-c/BUILD
@@ -239,17 +239,18 @@ grpc_objc_library(
     ],
 )
 
-grpc_objc_library(
-    name = "grpc_objc_client_core_cronet_testing",
-    srcs = glob(["GRPCClient/private/GRPCCore/GRPCCoreCronet/*.m"]),
-    hdrs = glob(["GRPCClient/private/GRPCCore/GRPCCoreCronet/*.h"]),
-    deps = [
-        ":grpc_objc_client_core_internal_testing",
-        "//:grpc_cronet_hdrs",
-        "//src/core/ext/transport/cronet:grpc_transport_cronet_client_secure",
-        "@CronetFramework",
-    ],
-)
+# TODO: Enable this again once @CronetFramework is working
+#grpc_objc_library(
+#    name = "grpc_objc_client_core_cronet_testing",
+#    srcs = glob(["GRPCClient/private/GRPCCore/GRPCCoreCronet/*.m"]),
+#    hdrs = glob(["GRPCClient/private/GRPCCore/GRPCCoreCronet/*.h"]),
+#    deps = [
+#        ":grpc_objc_client_core_internal_testing",
+#        "//:grpc_cronet_hdrs",
+#        "//src/core/ext/transport/cronet:grpc_transport_cronet_client_secure",
+#        "@CronetFramework",
+#    ],
+#)
 
 grpc_objc_library(
     name = "proto_objc_rpc_internal_testing",
diff --git a/src/objective-c/tests/BUILD b/src/objective-c/tests/BUILD
index efb3ba8d223..8ba23c1fde8 100644
--- a/src/objective-c/tests/BUILD
+++ b/src/objective-c/tests/BUILD
@@ -171,71 +171,72 @@ grpc_objc_testing_library(
     hdrs = ["MacTests/StressTests.h"],
 )
 
-grpc_objc_testing_library(
-    name = "CronetTests-lib",
-    srcs = [
-        "ConfigureCronet.m",
-    ] + glob([
-        "CronetTests/*.m",
-        "CronetTests/*.mm",
-    ]),
-    hdrs = [
-        "ConfigureCronet.h",
-    ],
-    deps = [
-        "InteropTests-lib",
-        "//src/objective-c:grpc_objc_client_core_cronet_testing",
-        "//test/core/end2end:cq_verifier",
-        "//test/core/end2end:ssl_test_data",
-        "//third_party/objective_c/Cronet:cronet_c_for_grpc",
-    ],
-)
-
-grpc_objc_testing_library(
-    name = "CppCronetTests-lib",
-    srcs = glob([
-        "CppCronetTests/*.m",
-        "CppCronetTests/*.mm",
-    ]),
-    hdrs = glob([
-        "CppCronetTests/*.h",
-    ]),
-    deps = [
-        "//:grpc++_cronet_credentials",
-        "//src/objective-c:grpc_objc_client_core_cronet_testing",
-        "//src/proto/grpc/testing:echo_proto",
-        "//test/core/end2end:ssl_test_data",
-    ],
-)
-
-grpc_objc_testing_library(
-    name = "PerfTests-lib-Posix",
-    srcs = [
-        "ConfigureCronet.m",
-        "PerfTests/PerfTests.m",
-        "PerfTests/PerfTestsBlockCallbacks.m",
-        "PerfTests/PerfTestsNoCFStreamSSL.m",
-    ],
-    hdrs = ["ConfigureCronet.h"] + glob(["PerfTests/*.h"]),
-    deps = [
-        "//src/objective-c:grpc_objc_client_core_cronet_testing",
-    ],
-)
-
-grpc_objc_testing_library(
-    name = "PerfTests-lib",
-    srcs = [
-        "ConfigureCronet.m",
-        "PerfTests/PerfTests.m",
-        "PerfTests/PerfTestsBlockCallbacks.m",
-        "PerfTests/PerfTestsCFStreamSSL.m",
-        "PerfTests/PerfTestsCronet.m",
-    ],
-    hdrs = ["ConfigureCronet.h"] + glob(["PerfTests/*.h"]),
-    deps = [
-        "//src/objective-c:grpc_objc_client_core_cronet_testing",
-    ],
-)
+# TODO: Enable this again once @CronetFramework is working
+#grpc_objc_testing_library(
+#    name = "CronetTests-lib",
+#    srcs = [
+#        "ConfigureCronet.m",
+#    ] + glob([
+#        "CronetTests/*.m",
+#        "CronetTests/*.mm",
+#    ]),
+#    hdrs = [
+#        "ConfigureCronet.h",
+#    ],
+#    deps = [
+#        "InteropTests-lib",
+#        "//src/objective-c:grpc_objc_client_core_cronet_testing",
+#        "//test/core/end2end:cq_verifier",
+#        "//test/core/end2end:ssl_test_data",
+#        "//third_party/objective_c/Cronet:cronet_c_for_grpc",
+#    ],
+#)
+#
+#grpc_objc_testing_library(
+#    name = "CppCronetTests-lib",
+#    srcs = glob([
+#        "CppCronetTests/*.m",
+#        "CppCronetTests/*.mm",
+#    ]),
+#    hdrs = glob([
+#        "CppCronetTests/*.h",
+#    ]),
+#    deps = [
+#        "//:grpc++_cronet_credentials",
+#        "//src/objective-c:grpc_objc_client_core_cronet_testing",
+#        "//src/proto/grpc/testing:echo_proto",
+#        "//test/core/end2end:ssl_test_data",
+#    ],
+#)
+#
+#grpc_objc_testing_library(
+#    name = "PerfTests-lib-Posix",
+#    srcs = [
+#        "ConfigureCronet.m",
+#        "PerfTests/PerfTests.m",
+#        "PerfTests/PerfTestsBlockCallbacks.m",
+#        "PerfTests/PerfTestsNoCFStreamSSL.m",
+#    ],
+#    hdrs = ["ConfigureCronet.h"] + glob(["PerfTests/*.h"]),
+#    deps = [
+#        "//src/objective-c:grpc_objc_client_core_cronet_testing",
+#    ],
+#)
+#
+#grpc_objc_testing_library(
+#    name = "PerfTests-lib",
+#    srcs = [
+#        "ConfigureCronet.m",
+#        "PerfTests/PerfTests.m",
+#        "PerfTests/PerfTestsBlockCallbacks.m",
+#        "PerfTests/PerfTestsCFStreamSSL.m",
+#        "PerfTests/PerfTestsCronet.m",
+#    ],
+#    hdrs = ["ConfigureCronet.h"] + glob(["PerfTests/*.h"]),
+#    deps = [
+#        "//src/objective-c:grpc_objc_client_core_cronet_testing",
+#    ],
+#)
 
 grpc_objc_testing_library(
     name = "UnitTests",
@@ -271,36 +272,37 @@ grpc_objc_ios_unit_test(
     ],
 )
 
-grpc_objc_ios_unit_test(
-    name = "CronetTests",
-    deps = [
-        "CronetTests-lib",
-    ],
-)
-
-grpc_objc_ios_unit_test(
-    name = "CppCronetTests",
-    deps = [
-        "CppCronetTests-lib",
-    ],
-)
-
-grpc_objc_ios_unit_test(
-    name = "PerfTestsPosix",
-    deps = [
-        "PerfTests-lib-Posix",
-    ],
-)
-
-grpc_objc_ios_unit_test(
-    name = "PerfTests",
-    env = {
-        "GRPC_CFSTREAM_RUN_LOOP": "1",
-    },
-    deps = [
-        "PerfTests-lib",
-    ],
-)
+# TODO: Enable this again once @CronetFramework is working
+# grpc_objc_ios_unit_test(
+#     name = "CronetTests",
+#     deps = [
+#         "CronetTests-lib",
+#     ],
+# )
+#
+# grpc_objc_ios_unit_test(
+#     name = "CppCronetTests",
+#     deps = [
+#         "CppCronetTests-lib",
+#     ],
+# )
+#
+# grpc_objc_ios_unit_test(
+#     name = "PerfTestsPosix",
+#     deps = [
+#         "PerfTests-lib-Posix",
+#     ],
+# )
+#
+# grpc_objc_ios_unit_test(
+#     name = "PerfTests",
+#     env = {
+#         "GRPC_CFSTREAM_RUN_LOOP": "1",
+#     },
+#     deps = [
+#         "PerfTests-lib",
+#     ],
+# )
 
 macos_unit_test(
     name = "MacTests",
diff --git a/templates/tools/dockerfile/bazel.include b/templates/tools/dockerfile/bazel.include
index 4fdcda78694..377de15bb52 100644
--- a/templates/tools/dockerfile/bazel.include
+++ b/templates/tools/dockerfile/bazel.include
@@ -2,7 +2,7 @@
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 5.3.0
+ENV BAZEL_VERSION 6.1.2
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/templates/tools/dockerfile/oss_fuzz_base.include b/templates/tools/dockerfile/oss_fuzz_base.include
index 1ac194a246e..a12cd8c1c49 100644
--- a/templates/tools/dockerfile/oss_fuzz_base.include
+++ b/templates/tools/dockerfile/oss_fuzz_base.include
@@ -1,8 +1,8 @@
 # Pinned version of the base image is used to avoid regressions caused
 # by rebuilding of this docker image. To see available versions, you can run
 # "gcloud container images list-tags gcr.io/oss-fuzz-base/base-builder"
-# Image(8a3a7b8072a9) is built on Sep 5, 2022
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:8a3a7b8072a93ba737b02e0c0941903f5408b4def6333fdc823b77aede5b2afd
+# Image(a4ad7a70fe10) is built on Apr 19, 2023
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:a4ad7a70fe10674c880ca8618a564860114a31dcdd6f9896aac89f0b2f86112a
 
 # -------------------------- WARNING --------------------------------------
 # If you are making changes to this file, consider changing
diff --git a/tools/bazel b/tools/bazel
index 85a75b3d4e8..a835d656dec 100755
--- a/tools/bazel
+++ b/tools/bazel
@@ -42,7 +42,7 @@ fi
 
 # IMPORTANT: if you update the version here, other parts of infrastructure might needs updating as well
 # (e.g. sanity checks, bazel toolchains etc.)
-VERSION=${OVERRIDE_BAZEL_VERSION:-5.3.0}
+VERSION=${OVERRIDE_BAZEL_VERSION:-6.1.2}
 echo "INFO: Running bazel wrapper (see //tools/bazel for details), bazel version $VERSION will be used instead of system-wide bazel installation." >&2
 
 # update tools/update_mirror.sh to populate the mirror with new bazel archives
diff --git a/tools/dockerfile/test/bazel.current_version b/tools/dockerfile/test/bazel.current_version
index a0173c02a18..af96da44ed6 100644
--- a/tools/dockerfile/test/bazel.current_version
+++ b/tools/dockerfile/test/bazel.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/bazel:b7cb23cf132daefa62a7a108271528dea0c45403@sha256:8c31d465e58102b259274f38dd688e3b570682940fa05dea1cf1b10abca02a0b
+us-docker.pkg.dev/grpc-testing/testing-images-public/bazel:0f909e43012a80faa92e07b7871268841ce56ebc@sha256:1118150d9d9479787165fff49f660a3dc633f1c57604305460172fc1916aa022
\ No newline at end of file
diff --git a/tools/dockerfile/test/bazel/Dockerfile b/tools/dockerfile/test/bazel/Dockerfile
index 9c6a14df768..070944ead1b 100644
--- a/tools/dockerfile/test/bazel/Dockerfile
+++ b/tools/dockerfile/test/bazel/Dockerfile
@@ -15,8 +15,8 @@
 # Pinned version of the base image is used to avoid regressions caused
 # by rebuilding of this docker image. To see available versions, you can run
 # "gcloud container images list-tags gcr.io/oss-fuzz-base/base-builder"
-# Image(8a3a7b8072a9) is built on Sep 5, 2022
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:8a3a7b8072a93ba737b02e0c0941903f5408b4def6333fdc823b77aede5b2afd
+# Image(a4ad7a70fe10) is built on Apr 19, 2023
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:a4ad7a70fe10674c880ca8618a564860114a31dcdd6f9896aac89f0b2f86112a
 
 # -------------------------- WARNING --------------------------------------
 # If you are making changes to this file, consider changing
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get -y install \
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 5.3.0
+ENV BAZEL_VERSION 6.1.2
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/dockerfile/test/bazel_arm64.current_version b/tools/dockerfile/test/bazel_arm64.current_version
index b9a30bf31d2..5447db870dd 100644
--- a/tools/dockerfile/test/bazel_arm64.current_version
+++ b/tools/dockerfile/test/bazel_arm64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64:9517bfbd2d0cf0f6a830e8d8e152c85f2f94ec1d@sha256:4c860be7b181655be5067bd7676c384552b2fe55ee3cbcc800888322dd8380b9
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64:a272710054f09ab7594fbae721de67ecd964d0a1@sha256:dd4a71e2852faf24b45e21445331f400bb278c83f6ad6d7d89d43c9ac564d529
\ No newline at end of file
diff --git a/tools/dockerfile/test/bazel_arm64/Dockerfile b/tools/dockerfile/test/bazel_arm64/Dockerfile
index 2fc7eb846f0..3c138cd6b57 100644
--- a/tools/dockerfile/test/bazel_arm64/Dockerfile
+++ b/tools/dockerfile/test/bazel_arm64/Dockerfile
@@ -88,7 +88,7 @@ RUN apt-get update && apt-get -y install libc++-dev clang && apt-get clean
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 5.3.0
+ENV BAZEL_VERSION 6.1.2
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/dockerfile/test/binder_transport_apk.current_version b/tools/dockerfile/test/binder_transport_apk.current_version
index 0876af4a96f..188d50a91fc 100644
--- a/tools/dockerfile/test/binder_transport_apk.current_version
+++ b/tools/dockerfile/test/binder_transport_apk.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk:7a0e59e4e89958d4eb461dda14e6197951c28e43@sha256:f098ac40d4819b21b4ba8fc8f7715039e7c4285be736813f2aeb8e00e158ca12
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk:6f6d33e740ced89b744c2d8bdf0e9c4744cc1c52@sha256:85341f035e44601a93d16ff5b9b5810a0da313af03e2a76cf4135144633e0bab
\ No newline at end of file
diff --git a/tools/dockerfile/test/binder_transport_apk/Dockerfile b/tools/dockerfile/test/binder_transport_apk/Dockerfile
index 4025e6e4cf0..dea068279a1 100644
--- a/tools/dockerfile/test/binder_transport_apk/Dockerfile
+++ b/tools/dockerfile/test/binder_transport_apk/Dockerfile
@@ -15,8 +15,8 @@
 # Pinned version of the base image is used to avoid regressions caused
 # by rebuilding of this docker image. To see available versions, you can run
 # "gcloud container images list-tags gcr.io/oss-fuzz-base/base-builder"
-# Image(8a3a7b8072a9) is built on Sep 5, 2022
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:8a3a7b8072a93ba737b02e0c0941903f5408b4def6333fdc823b77aede5b2afd
+# Image(a4ad7a70fe10) is built on Apr 19, 2023
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:a4ad7a70fe10674c880ca8618a564860114a31dcdd6f9896aac89f0b2f86112a
 
 # -------------------------- WARNING --------------------------------------
 # If you are making changes to this file, consider changing
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get -y install \
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 5.3.0
+ENV BAZEL_VERSION 6.1.2
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/dockerfile/test/sanity.current_version b/tools/dockerfile/test/sanity.current_version
index 4a30f56f276..fcd7f66389d 100644
--- a/tools/dockerfile/test/sanity.current_version
+++ b/tools/dockerfile/test/sanity.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/sanity:66c9d7a730029cfb6fb74cc8fa722927fd70bc79@sha256:d3bfac6827ec0e9e0103e8dabc8ba535e09af5e1a1305943f1464975de38d848
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/sanity:bdca9dc08b4c765efc427cc6d9204005799dda34@sha256:189e07d8503aa15344e3c8f565783659c3e2edc5b8ca455ec427de1e29ef4504
\ No newline at end of file
diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile
index 1e6214513ce..63cfa2a9d21 100644
--- a/tools/dockerfile/test/sanity/Dockerfile
+++ b/tools/dockerfile/test/sanity/Dockerfile
@@ -102,7 +102,7 @@ RUN apt-get update && apt-get install -y jq git cmake zlib1g-dev libtinfo-dev li
 # Bazel installation
 
 # Must be in sync with tools/bazel
-ENV BAZEL_VERSION 5.3.0
+ENV BAZEL_VERSION 6.1.2
 
 # The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
 ENV DISABLE_BAZEL_WRAPPER 1
diff --git a/tools/internal_ci/macos/grpc_objc_bazel_test.sh b/tools/internal_ci/macos/grpc_objc_bazel_test.sh
index a9b9e1c066b..af3b2bf6302 100644
--- a/tools/internal_ci/macos/grpc_objc_bazel_test.sh
+++ b/tools/internal_ci/macos/grpc_objc_bazel_test.sh
@@ -56,9 +56,10 @@ TEST_TARGETS=(
   //src/objective-c/tests:InteropTestsRemote
   //src/objective-c/tests:MacTests
   //src/objective-c/tests:UnitTests
-  //src/objective-c/tests:CppCronetTests
-  //src/objective-c/tests:CronetTests
-  //src/objective-c/tests:PerfTests
+  # TODO: Enable this again once @CronetFramework is working
+  #//src/objective-c/tests:CppCronetTests
+  #//src/objective-c/tests:CronetTests
+  #//src/objective-c/tests:PerfTests
   //src/objective-c/tests:CFStreamTests
   //src/objective-c/tests:tvtests_build_test
   # codegen plugin tests
diff --git a/tools/internal_ci/windows/bazel_rbe.bat b/tools/internal_ci/windows/bazel_rbe.bat
index 4bd9cb6c9ee..103643c6d6c 100644
--- a/tools/internal_ci/windows/bazel_rbe.bat
+++ b/tools/internal_ci/windows/bazel_rbe.bat
@@ -29,6 +29,8 @@ call tools/internal_ci/helper_scripts/prepare_build_windows.bat || exit /b 1
 @rem Install bazel
 @rem Side effect of the tools/bazel script is that it downloads the correct version of bazel binary.
 mkdir C:\bazel
+@rem This is a workaround to resolve weird linker error from Bazel 6.x
+set OVERRIDE_BAZEL_VERSION=5.4.1
 bash -c "tools/bazel --version && cp tools/bazel-*.exe /c/bazel/bazel.exe"
 set PATH=C:\bazel;%PATH%
 bazel --version