diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
deleted file mode 100644
index a5e4c43..0000000
--- a/.bazelci/presubmit.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tasks:
-  ubuntu2204-c++14:
-    platform: "ubuntu2204"
-    build_targets:
-      - "//..."
-      - "-//experiments/..."
-    build_flags:
-      - "--cxxopt=-std=c++14"
-      - "--host_cxxopt=-std=c++14"
-    test_flags:
-      - "--test_tag_filters=-benchmark"
-    test_targets:
-      - "//..."
-  ubuntu2204-c++17:
-    platform: "ubuntu2204"
-    build_targets:
-      - "//..."
-    build_flags:
-      - "--cxxopt=-std=c++17"
-      - "--host_cxxopt=-std=c++17"
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 4236712..507caad 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -16,9 +16,9 @@ name: Distributed Point Functions
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "master" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -43,12 +43,13 @@ jobs:
 
       - name: "Run `bazel build` (C++14)"
         run: |
-          bazel build -c opt --cxxopt=-std=c++14 --host_cxxopt=-std=c++14 -- //... -//experiments/...
+          bazel --output_base $HOME/.cache/bazel/cpp14 build -c opt --cxxopt=-std=c++14 \
+             --host_cxxopt=-std=c++14 -- //... -//experiments/...
 
       - name: "Run `bazel build` (C++17)"
         run: |
-          bazel build -c opt --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 //...
+          bazel --output_base $HOME/.cache/bazel/cpp17 build -c opt //...
 
       - name: "Run `bazel test`"
         run: |
-          bazel test -c opt --test_tag_filters=-benchmark //... 
+          bazel --output_base $HOME/.cache/bazel/cpp17 test -c opt --test_tag_filters=-benchmark //...