diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 62ed30f79..823322850 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -1,22 +1,12 @@
 ---
 buildifier: latest
-bazel: 6.4.0
-platforms:
-  ubuntu1804:
-    environment:
-      CC: clang
-      SWIFT_VERSION: "5.8"
-      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
-      PATH: "$PATH:$SWIFT_HOME/usr/bin"
-    shell_commands:
-      - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
-      - "mkdir $SWIFT_HOME"
-      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu1804/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu18.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
-    build_targets:
-    - "//..."
-    test_targets:
-    - "//..."
-  ubuntu2004:
+matrix:
+  bazel:
+    - 6.x
+tasks:
+  verify_ubuntu2004:
+    platform: ubuntu2004
+    bazel: ${{ bazel }}
     environment:
       CC: clang
       SWIFT_VERSION: "5.8"
@@ -30,7 +20,25 @@ platforms:
     - "//..."
     test_targets:
     - "//..."
-  macos:
+  verify_ubuntu2204:
+    platform: ubuntu2204
+    bazel: ${{ bazel }}
+    environment:
+      CC: clang
+      SWIFT_VERSION: "5.8"
+      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
+      PATH: "$PATH:$SWIFT_HOME/usr/bin"
+    shell_commands:
+      - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
+      - "mkdir $SWIFT_HOME"
+      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2204/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu22.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+    build_targets:
+    - "//..."
+    test_targets:
+    - "//..."
+  verify_macos:
+    platform: macos
+    bazel: ${{ bazel }}
     xcode_version: "14.3"
     build_targets:
     - "//:flatbuffers"
diff --git a/MODULE.bazel b/MODULE.bazel
index 4c505e1c1..bf370ec1b 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -80,5 +80,5 @@ bazel_binaries = use_extension(
     "bazel_binaries",
     dev_dependency = True,
 )
-bazel_binaries.download(version = "6.3.2")
-use_repo(bazel_binaries, "bazel_binaries", "bazel_binaries_bazelisk", "build_bazel_bazel_6_3_2")
+bazel_binaries.download(version = "6.5.0")
+use_repo(bazel_binaries, "bazel_binaries", "bazel_binaries_bazelisk", "build_bazel_bazel_6_5_0")
diff --git a/WORKSPACE b/WORKSPACE
index 30638e57b..1cac3e974 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -209,4 +209,4 @@ bazel_starlib_dependencies()
 
 load("@rules_bazel_integration_test//bazel_integration_test:defs.bzl", "bazel_binaries")
 
-bazel_binaries(versions = ["6.3.2"])
+bazel_binaries(versions = ["6.5.0"])