diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 4e97538c11..5ee0583c1e 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -89,14 +89,14 @@ split_coverage_postprocessing_shell_commands: &split_coverage_postprocessing_she
   - echo "coverage --experimental_split_coverage_postprocessing" >> user.bazelrc
   - echo "build --//rust/settings:experimental_use_coverage_metadata_files" >> user.bazelrc
 tasks:
-  ubuntu2004:
+  ubuntu2204:
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
     post_shell_commands: *coverage_validation_post_shell_commands
     run_targets:
       - //test:query_test_binary
-  rbe_ubuntu2004:
+  rbe_ubuntu2204:
     shell_commands:
       - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
@@ -111,9 +111,9 @@ tasks:
   windows:
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
-  ubuntu2004_no_bzlmod:
+  ubuntu2204_no_bzlmod:
     name: No Bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     bazel: *no_bzlmod_bazel_version
     shell_commands: *no_bzlmod_shell_commands
     build_targets: *default_linux_targets
@@ -122,9 +122,9 @@ tasks:
     post_shell_commands: *coverage_validation_post_shell_commands
     run_targets:
       - //test:query_test_binary
-  rbe_ubuntu2004_no_bzlmod:
+  rbe_ubuntu2204_no_bzlmod:
     name: No Bzlmod
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     bazel: *no_bzlmod_bazel_version
     shell_commands: *no_bzlmod_rbe_shell_commands
     build_targets: *default_rbe_targets
@@ -153,9 +153,9 @@ tasks:
       - echo common --noenable_runfiles >> user.bazelrc
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
-  ubuntu2004_split_coverage_postprocessing:
+  ubuntu2204_split_coverage_postprocessing:
     name: Split Coverage Postprocessing
-    platform: ubuntu2004
+    platform: ubuntu2204
     shell_commands: *split_coverage_postprocessing_shell_commands
     coverage_targets: *default_linux_targets
     post_shell_commands: *coverage_validation_post_shell_commands
@@ -165,9 +165,9 @@ tasks:
     shell_commands: *split_coverage_postprocessing_shell_commands
     coverage_targets: *default_macos_targets
     post_shell_commands: *coverage_validation_post_shell_commands
-  ubuntu2004_opt:
+  ubuntu2204_opt:
     name: Opt Mode
-    platform: ubuntu2004
+    platform: ubuntu2204
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     build_flags:
@@ -192,26 +192,26 @@ tasks:
       - "--compilation_mode=opt"
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
-  ubuntu2004_with_aspects:
+  ubuntu2204_with_aspects:
     name: With Aspects
-    platform: ubuntu2004
+    platform: ubuntu2204
     build_flags: *aspects_flags
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
     post_shell_commands: *coverage_validation_post_shell_commands
-  rbe_ubuntu2004_with_aspects:
+  rbe_ubuntu2204_with_aspects:
     name: With Aspects
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     shell_commands:
       - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
     build_flags: *aspects_flags
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
-  rbe_ubuntu2004_rolling_with_aspects:
+  rbe_ubuntu2204_rolling_with_aspects:
     name: RBE Rolling Bazel Version With Aspects
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     shell_commands:
       - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
@@ -270,16 +270,16 @@ tasks:
     test_targets: *default_windows_targets
     soft_fail: yes
     bazel: "rolling"
-  ubuntu2004_unpretty:
+  ubuntu2204_unpretty:
     name: Unpretty
-    platform: ubuntu2004
+    platform: ubuntu2204
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     build_flags:
       - "--config=unpretty"
-  ubuntu2004_bzlmod_only:
+  ubuntu2204_bzlmod_only:
     name: With bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     # See https://bazel.build/external/migration#migration-process
     # When WORKSPACE.bzlmod is provided, the workspace file is ignored.
     shell_commands:
@@ -290,18 +290,18 @@ tasks:
       - "//crate_universe:cargo_bazel_bin"
       - "//rust/runfiles"
       - "//util/import"
-  ubuntu2004_clang:
+  ubuntu2204_clang:
     name: With Clang
-    platform: ubuntu2004
+    platform: ubuntu2204
     build_flags:
       - "--config=rustfmt"
       - "--config=clippy"
       - "--repo_env=CC=clang"
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
-  ubuntu2004_clang_lld:
+  ubuntu2204_clang_lld:
     name: With Clang and LLD
-    platform: ubuntu2004
+    platform: ubuntu2204
     shell_commands:
       - "sudo apt -y update && sudo apt -y install lld"
     build_flags:
@@ -311,9 +311,9 @@ tasks:
       - "--linkopt=-fuse-ld=lld"
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
-  ubuntu2004_rolling_clang:
+  ubuntu2204_rolling_clang:
     name: Rolling Bazel Version With Clang
-    platform: ubuntu2004
+    platform: ubuntu2204
     build_flags:
       - "--config=rustfmt"
       - "--config=clippy"
@@ -342,32 +342,32 @@ tasks:
     build_flags: *aspects_flags
     coverage_targets: *default_linux_targets
     post_shell_commands: *coverage_validation_post_shell_commands
-  ubuntu2004_min_rust_version:
+  ubuntu2204_min_rust_version:
     name: "Min Rust Version"
-    platform: ubuntu2004
+    platform: ubuntu2204
     shell_commands: *min_rust_version_shell_commands
     build_targets: *single_rust_channel_min_version_targets
     test_targets: *single_rust_channel_min_version_targets
-  ubuntu2004_min_rust_version_with_aspects:
+  ubuntu2204_min_rust_version_with_aspects:
     name: "Min Rust Version With Aspects"
-    platform: ubuntu2004
+    platform: ubuntu2204
     shell_commands: *min_rust_version_shell_commands
     build_flags: *aspects_flags
     build_targets: *single_rust_channel_min_version_targets
     test_flags: *aspects_flags
     test_targets: *single_rust_channel_min_version_targets
-  ubuntu2004_stable_toolchain:
+  ubuntu2204_stable_toolchain:
     name: "Only Stable Toolchain"
-    platform: ubuntu2004
+    platform: ubuntu2204
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_RUST_VERSION")\nrust_register_toolchains(versions = [DEFAULT_RUST_VERSION],\n|' WORKSPACE.bazel
       - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ['$(awk '$0 ~ /^DEFAULT_RUST_VERSION = / {print $3}' rust/private/common.bzl)'],\n|' MODULE.bazel
     build_targets: *single_rust_channel_targets
     test_targets: *single_rust_channel_targets
-  ubuntu2004_stable_with_aspects:
+  ubuntu2204_stable_with_aspects:
     name: "Only Stable Toolchain With Aspects"
-    platform: ubuntu2004
+    platform: ubuntu2204
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_RUST_VERSION")\nrust_register_toolchains(versions = [DEFAULT_RUST_VERSION],\n|' WORKSPACE.bazel
@@ -376,9 +376,9 @@ tasks:
     build_targets: *single_rust_channel_targets
     test_flags: *aspects_flags
     test_targets: *single_rust_channel_targets
-  ubuntu2004_nightly_toolchain:
+  ubuntu2204_nightly_toolchain:
     name: "Only Nightly Toolchain"
-    platform: ubuntu2004
+    platform: ubuntu2204
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
@@ -387,9 +387,9 @@ tasks:
     build_targets: *single_rust_channel_targets
     test_flags: *nightly_flags
     test_targets: *single_rust_channel_targets
-  ubuntu2004_nightly_with_aspects:
+  ubuntu2204_nightly_with_aspects:
     name: "Only Nightly Toolchain With Aspects"
-    platform: ubuntu2004
+    platform: ubuntu2204
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
@@ -398,10 +398,10 @@ tasks:
     build_targets: *single_rust_channel_targets
     test_flags: *nightly_aspects_flags
     test_targets: *single_rust_channel_targets
-  ubuntu2004_rolling_with_aspects:
+  ubuntu2204_rolling_with_aspects:
     name: "Rolling Bazel Version With Aspects"
     bazel: "rolling"
-    platform: ubuntu2004
+    platform: ubuntu2204
     build_flags: *aspects_flags
     soft_fail: yes
     build_targets: *default_linux_targets
@@ -410,7 +410,7 @@ tasks:
     post_shell_commands: *coverage_validation_post_shell_commands
   linux_docs:
     name: Docs
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: docs
     build_targets:
       - //...
@@ -418,23 +418,23 @@ tasks:
       - "//:publish_book"
   clippy_failure:
     name: Negative Clippy Tests
-    platform: ubuntu2004
+    platform: ubuntu2204
     run_targets:
       - "//test/clippy:clippy_failure_tester"
   rustfmt_failure:
     name: Negative Rustfmt Tests
-    platform: ubuntu2004
+    platform: ubuntu2204
     run_targets:
       - "//test/rustfmt:rustfmt_failure_tester"
   rust_analyzer_tests:
     name: Rust-Analyzer Tests
-    platform: ubuntu2004
+    platform: ubuntu2204
     run_targets:
       - "//tools/rust_analyzer:gen_rust_project"
       - "//test/rust_analyzer:rust_analyzer_test"
-  crate_universe_examples_ubuntu2004:
+  crate_universe_examples_ubuntu2204:
     name: Crate Universe Examples
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/crate_universe
     run_targets: *crate_universe_vendor_example_targets
     build_targets:
@@ -442,9 +442,9 @@ tasks:
     test_targets:
       - "//..."
     build_flags: *aspects_flags
-  crate_universe_rbe_ubuntu2004:
+  crate_universe_rbe_ubuntu2204:
     name: Crate Universe Examples
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     working_directory: examples/crate_universe
     shell_commands:
       - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
@@ -473,19 +473,19 @@ tasks:
     build_flags: *aspects_flags
   crate_universe_local_path_external:
     name: Crate Universe Local Path External
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/crate_universe_local_path
     run_targets:
       - "//:vendor_edit_test_out_of_tree"
   crate_universe_local_path_in_tree:
     name: Crate Universe Local Path In Tree
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/crate_universe_local_path
     run_targets:
       - "//:vendor_edit_test_in_tree"
   crate_universe_local_path_external_no_bzlmod:
     name: Crate Universe Local Path External (No Bzlmod)
-    platform: ubuntu2004
+    platform: ubuntu2204
     bazel: *no_bzlmod_bazel_version
     shell_commands: *no_bzlmod_shell_commands
     working_directory: examples/crate_universe_local_path
@@ -493,7 +493,7 @@ tasks:
       - "//:vendor_edit_test_out_of_tree"
   crate_universe_local_path_in_tree_no_bzlmod:
     name: Crate Universe Local Path In Tree (No Bzlmod)
-    platform: ubuntu2004
+    platform: ubuntu2204
     bazel: *no_bzlmod_bazel_version
     shell_commands: *no_bzlmod_shell_commands
     working_directory: examples/crate_universe_local_path
@@ -518,9 +518,9 @@ tasks:
 #      - "//..."
 #    test_targets:
 #      - "//..."
-  cc_common_link_ubuntu2004:
+  cc_common_link_ubuntu2204:
     name: Build via cc_common.link
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/cc_common_link
     build_targets:
       - "//..."
@@ -534,9 +534,9 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-  cc_common_link_and_mangling_ubuntu2004:
+  cc_common_link_and_mangling_ubuntu2204:
     name: Build via cc_common.link with rustc mangling alloc symbols
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/cc_common_link
     build_targets:
       - "//..."
@@ -546,9 +546,9 @@ tasks:
       - "--config=mangled_alloc_symbols"
     test_flags:
       - "--config=mangled_alloc_symbols"
-  cc_common_link_with_global_alloc_ubuntu2004:
+  cc_common_link_with_global_alloc_ubuntu2204:
     name: Build via cc_common.link using a global allocator
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/cc_common_link_with_global_alloc
     build_targets:
       - "//..."
@@ -562,9 +562,9 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-  cc_common_link_with_global_alloc_and_mangling_ubuntu2004:
+  cc_common_link_with_global_alloc_and_mangling_ubuntu2204:
     name: Build via cc_common.link using a global allocator with rustc mangling alloc symbols
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/cc_common_link_with_global_alloc
     build_targets:
       - "//..."
@@ -574,9 +574,9 @@ tasks:
       - "--config=mangled_alloc_symbols"
     test_flags:
       - "--config=mangled_alloc_symbols"
-  cc_common_link_no_std_ubuntu2004:
+  cc_common_link_no_std_ubuntu2204:
     name: Build with no_std + alloc using cc_common.link infrastructure for linking
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/no_std
     build_targets:
       - "//..."
@@ -586,9 +586,9 @@ tasks:
       - "--config=no_std_alloc_using_cc_common_link"
     test_flags:
       - "--config=no_std_alloc_using_cc_common_link"
-  cc_common_link_no_std_and_mangling_ubuntu2004:
+  cc_common_link_no_std_and_mangling_ubuntu2204:
     name: Build with no_std + alloc using cc_common.link infrastructure for linking with rust toolchain mangling alloc symbols
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/no_std
     build_targets:
       - "//..."
@@ -598,9 +598,9 @@ tasks:
       - "--config=no_std_alloc_using_cc_common_link_and_mangled_alloc_symbols"
     test_flags:
       - "--config=no_std_alloc_using_cc_common_link_and_mangled_alloc_symbols"
-  no_std_ubuntu2004:
+  no_std_ubuntu2204:
     name: Build with no_std + alloc
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/no_std
     build_targets:
       - "//..."
@@ -612,20 +612,20 @@ tasks:
       - "--config=no_std_alloc"
   bzlmod_repo_mapping_runfiles:
     name: bzlmod repo mapping test
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/bzlmod_repo_mapping/module_a
     test_targets:
       - "//..."
   aliased_toolchains:
     name: aliased toolchains test
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: test/integration/aliased_toolchains
     build_targets:
       - "@rust_toolchains//:all"
       - "//..."
-  android_examples_ubuntu2004:
+  android_examples_ubuntu2204:
     name: Android Examples
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/android
     build_flags:
       - "--incompatible_enable_android_toolchain_resolution"
@@ -671,7 +671,7 @@ tasks:
   # TODO: https://github.com/bazelbuild/rules_rust/issues/2075
   # zig_cross_compiling:
   #   name: Zig cross compiling test
-  #   platform: ubuntu2004
+  #   platform: ubuntu2204
   #   working_directory: examples/zig_cross_compiling
   #   build_targets:
   #     - "//..."
@@ -706,13 +706,13 @@ tasks:
       - "//..."
   bzlmod_all_crate_deps:
     name: Cargo dependencies with bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/all_crate_deps
     build_targets:
       - "//..."
   bzlmod_all_deps_vendor:
     name: Vendored dependencies with bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/all_deps_vendor
     run_targets:
       - "//basic/3rdparty:crates_vendor"
@@ -720,13 +720,13 @@ tasks:
       - "//..."
   bzlmod_compile_opt:
     name: Compiler optimization with bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/compile_opt
     build_targets:
       - "//..."
   bzlmod_cross_compile:
     name: Cross compilation with bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/cross_compile
     build_targets:
       - "//:all"
@@ -741,7 +741,7 @@ tasks:
     test_targets:
       - "//..."
   example_ffi_linux:
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/ffi
     name: FFI Example
     build_targets:
@@ -750,7 +750,7 @@ tasks:
       - "//..."
   # TODO: https://github.com/bazelbuild/bazel/issues/9987
   # example_ffi_linux_rbe:
-  #   platform: rbe_ubuntu2004
+  #   platform: rbe_ubuntu2204
   #   working_directory: examples/ffi
   #   name: FFI Example
   #   build_targets:
@@ -773,9 +773,9 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-  ubuntu2004_bzlmod_bcr:
+  ubuntu2204_bzlmod_bcr:
     name: bzlmod BCR presubmit
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/hello_world
     test_flags: *bzlmod_flags
     run_targets:
@@ -783,10 +783,10 @@ tasks:
       - "@rules_rust//tools/rust_analyzer:gen_rust_project"
     test_targets:
       - "//..."
-  ubuntu2004_bzlmod_minimum_bazel_bcr:
+  ubuntu2204_bzlmod_minimum_bazel_bcr:
     name: bzlmod BCR presubmit minimal bazel
     bazel: *minimum_bazel_version
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/hello_world
     shell_commands:
       - "rm MODULE.bazel.lock"
@@ -818,7 +818,7 @@ tasks:
   #   test_targets:
   #     - "//..."
   example_sys_linux:
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/sys
     name: Sys Example
     build_targets:
@@ -826,7 +826,7 @@ tasks:
     test_targets:
       - "//..."
   example_sys_linux_rbe:
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/sys
     name: Sys Example
     build_targets:
@@ -849,12 +849,12 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-  ubuntu2004_bzlmod_plus_repo_names_bcr:
+  ubuntu2204_bzlmod_plus_repo_names_bcr:
     name: bzlmod BCR presubmit w/ incompatible flags
     # A newer version than is specified in the .bazel_version file is needed for
     # --incompatible_use_plus_in_repo_names'
     bazel: *minimum_bazel_version
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/hello_world
     test_flags: *bzlmod_plus_repo_names_flags
     run_targets:
@@ -891,13 +891,13 @@ tasks:
       - "//..."
   bzlmod_no_cargo:
     name: Cargo-less bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/hello_world_no_cargo
     build_targets:
       - "//..."
   bzlmod_override_targets:
     name: Override Targets bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/override_target
     build_targets:
       - "//..."
@@ -905,25 +905,25 @@ tasks:
       - "//..."
   bzlmod_proto:
     name: Proto and Prost with bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/proto
     build_targets:
       - "//..."
   bzlmod_protoc:
     name: Proto and Prost with prebuilt protoc with bzlmod
-    platform: ubuntu2004
+    platform: ubuntu2204
     working_directory: examples/proto_with_toolchain
     build_targets:
       - "//..."
   compile_one_dependency:
     name: --compile_one_dependency flag
-    platform: ubuntu2004
+    platform: ubuntu2204
     build_flags:
       - "--compile_one_dependency"
     build_targets:
       - "tools/rust_analyzer/bin/gen_rust_project.rs"
   extensions_bindgen_linux:
-    platform: ubuntu2004
+    platform: ubuntu2204
     name: Extensions Bindgen
     working_directory: extensions/bindgen
     build_flags: *aspects_flags
@@ -933,7 +933,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_bindgen_linux_rbe:
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     name: Extensions Bindgen
     working_directory: extensions/bindgen
     shell_commands:
@@ -970,7 +970,7 @@ tasks:
   #     - "--"
   #     - "//..."
   extensions_mdbook_linux:
-    platform: ubuntu2004
+    platform: ubuntu2204
     name: Extensions MdBook
     working_directory: extensions/mdbook
     build_flags: *aspects_flags
@@ -980,7 +980,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_mdbook_linux_rbe:
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     name: Extensions MdBook
     working_directory: extensions/mdbook
     shell_commands:
@@ -1013,7 +1013,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_prost_linux:
-    platform: ubuntu2004
+    platform: ubuntu2204
     name: Extensions Prost
     working_directory: extensions/prost
     build_flags: *aspects_flags
@@ -1023,7 +1023,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_prost_linux_rbe:
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     name: Extensions Prost
     working_directory: extensions/prost
     shell_commands:
@@ -1056,7 +1056,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_protobuf_linux:
-    platform: ubuntu2004
+    platform: ubuntu2204
     name: Extensions Protobuf
     working_directory: extensions/protobuf
     build_flags: *aspects_flags
@@ -1066,7 +1066,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_protobuf_linux_rbe:
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     name: Extensions Protobuf
     working_directory: extensions/protobuf
     shell_commands:
@@ -1099,7 +1099,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_wasm_bindgen_linux:
-    platform: ubuntu2004
+    platform: ubuntu2204
     name: Extensions wasm-bindgen
     working_directory: extensions/wasm_bindgen
     shell_commands:
@@ -1111,7 +1111,7 @@ tasks:
     test_targets:
       - "//..."
   extensions_wasm_bindgen_linux_rbe:
-    platform: rbe_ubuntu2004
+    platform: rbe_ubuntu2204
     name: Extensions wasm-bindgen
     working_directory: extensions/wasm_bindgen
     shell_commands:
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 350ae68ccb..add64b028b 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -52,4 +52,4 @@ http_archive(
 # To run with RBE on Bazel CI, uncomment the following lines.
 #
 # load("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
-# rbe_preconfig(name = "buildkite_config", toolchain = "ubuntu2004-bazel-java11")
+# rbe_preconfig(name = "buildkite_config", toolchain = "ubuntu2204")
diff --git a/extensions/prost/private/internal_extensions.bzl b/extensions/prost/private/internal_extensions.bzl
index 3b76d5e6ad..29341c7a66 100644
--- a/extensions/prost/private/internal_extensions.bzl
+++ b/extensions/prost/private/internal_extensions.bzl
@@ -7,7 +7,7 @@ def _rust_ext_dev_impl(module_ctx):
 
     rbe_preconfig(
         name = "buildkite_config",
-        toolchain = "ubuntu1804-bazel-java11",
+        toolchain = "ubuntu2204",
     )
 
     deps.append(struct(repo = "buildkite_config"))
diff --git a/extensions/protobuf/private/internal_extensions.bzl b/extensions/protobuf/private/internal_extensions.bzl
index 06c51353d3..3537b0d7d6 100644
--- a/extensions/protobuf/private/internal_extensions.bzl
+++ b/extensions/protobuf/private/internal_extensions.bzl
@@ -7,7 +7,7 @@ def _rust_ext_dev_impl(module_ctx):
 
     rbe_preconfig(
         name = "buildkite_config",
-        toolchain = "ubuntu1804-bazel-java11",
+        toolchain = "ubuntu2204",
     )
 
     deps.append(struct(repo = "buildkite_config"))