diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 9e49c0ccb0..58645b360e 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -7,43 +7,35 @@ buildifier:
   # Keep this in sync with the list in .pre-commit-config.yaml
   # https://github.com/bazelbuild/buildtools/issues/479 should fix this by giving us a config file
 tasks:
-  ubuntu1804:
-    name: ubuntu1804
-    platform: ubuntu1804
+  ubuntu2204:
+    name: ubuntu2204
+    platform: ubuntu2204
     build_targets:
       - "//..."
-    test_flags:
-      - "--test_tag_filters=-skip-on-bazelci-ubuntu"
     test_targets:
       - "//..."
-  ubuntu1804-headers:
-    name: ubuntu1804-headers
-    platform: ubuntu1804
+  ubuntu2204-headers:
+    name: ubuntu2204-headers
+    platform: ubuntu2204
     working_directory: "e2e/headers"
     build_targets:
       - "//..."
-    test_flags:
-      - "--test_tag_filters=-skip-on-bazelci-ubuntu"
     test_targets:
       - "//..."
-  ubuntu1804-smoke:
-    name: ubuntu1804-smoke
-    platform: ubuntu1804
+  ubuntu2204-smoke:
+    name: ubuntu2204-smoke
+    platform: ubuntu2204
     working_directory: "e2e/smoke"
     build_targets:
       - "//..."
-    test_flags:
-      - "--test_tag_filters=-skip-on-bazelci-ubuntu"
     test_targets:
       - "//..."
-  ubuntu1804-nodejs_host:
-    name: ubuntu1804-nodejs_host
-    platform: ubuntu1804
+  ubuntu2204-nodejs_host:
+    name: ubuntu2204-nodejs_host
+    platform: ubuntu2204
     working_directory: "e2e/nodejs_host"
     build_targets:
       - "//..."
-    test_flags:
-      - "--test_tag_filters=-skip-on-bazelci-ubuntu"
     test_targets:
       - "//..."
   macos:
@@ -91,13 +83,11 @@ tasks:
     working_directory: "e2e/nodejs_host"
     build_targets:
       - "//..."
-    test_flags:
-      - "--test_tag_filters=-skip-on-bazelci-windows"
     test_targets:
       - "//..."
-  rbe_ubuntu1604-smoke:
-    name: rbe_ubuntu1604-smoke
-    platform: rbe_ubuntu1604
+  rbe_ubuntu2204-smoke:
+    name: rbe_ubuntu2204-smoke
+    platform: rbe_ubuntu2204
     working_directory: "e2e/smoke"
     build_targets:
       - "//..."
diff --git a/e2e/nodejs_host/BUILD.bazel b/e2e/nodejs_host/BUILD.bazel
index 243ef126ba..178ca64f89 100644
--- a/e2e/nodejs_host/BUILD.bazel
+++ b/e2e/nodejs_host/BUILD.bazel
@@ -48,24 +48,21 @@
             "@%s//:node" % node_toolchain,
             "@bazel_tools//tools/bash/runfiles",
         ],
-        tags = tags,
     )
-    for (node_toolchain, tool, tags) in [
+    for (node_toolchain, tool) in [
         (
             "nodejs",
             "npm",
-            ["skip-on-bazelci-ubuntu"],  # fails on Bazel CI Ubuntu on latest Node.js due to GLIBC version on runner: "GLIBC_2.28 not found" (https://buildkite.com/bazel/rules-nodejs-nodejs/builds/13451#018feffd-4878-46e4-8582-ae94648a2d74)
         ),
         (
             "nodejs",
             "npx",
-            ["skip-on-bazelci-ubuntu"],  # fails on Bazel CI Ubuntu on latest Node.js due to GLIBC version on runner: "GLIBC_2.28 not found" (https://buildkite.com/bazel/rules-nodejs-nodejs/builds/13451#018feffd-4878-46e4-8582-ae94648a2d74)
         ),
-        ("node16", "npm", []),
-        ("node16", "npx", []),
-        ("node16_nvmrc", "npm", []),
-        ("node16_nvmrc", "npx", []),
-        ("node17_custom", "npm", []),
-        ("node17_custom", "npx", []),
+        ("node16", "npm"),
+        ("node16", "npx"),
+        ("node16_nvmrc", "npm"),
+        ("node16_nvmrc", "npx"),
+        ("node17_custom", "npm"),
+        ("node17_custom", "npx"),
     ]
 ]
diff --git a/e2e/smoke/WORKSPACE.bzlmod b/e2e/smoke/WORKSPACE.bzlmod
index cb8c8b7f9b..19d242089c 100644
--- a/e2e/smoke/WORKSPACE.bzlmod
+++ b/e2e/smoke/WORKSPACE.bzlmod
@@ -14,8 +14,8 @@ http_archive(
 load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")
 
 # Creates toolchain configuration for remote execution with BuildKite CI
-# for rbe_ubuntu1604
+# for rbe_ubuntu2204
 rbe_preconfig(
     name = "buildkite_config",
-    toolchain = "ubuntu1804-bazel-java11",
+    toolchain = "ubuntu2204",
 )