diff --git a/.buildkite-bazelrc b/.buildkite-bazelrc
index c28278a00..43d88b140 100644
--- a/.buildkite-bazelrc
+++ b/.buildkite-bazelrc
@@ -1,12 +1,19 @@
-startup --host_jvm_args=-Xmx500m --host_jvm_args=-Xms500m
+build:remote --remote_max_connections=200
+build:remote --disk_cache=
+build:remote --remote_http_cache=https://storage.googleapis.com/prysmatic-bazel-cache
+build:remote --google_default_credentials
+build:remote --remote_timeout=10
+build:remote --experimental_guard_against_concurrent_changes
 
-build --local_resources=3072,1,1
-build --spawn_strategy=standalone --genrule_strategy=standalone
 build --experimental_strict_action_env
 build --disk_cache=/tmp/bazelbuilds
-build --noshow_progress
+build --experimental_multi_threaded_digest
+build --sandbox_tmpfs_path=/tmp
 build --verbose_failures
+build --announce_rc
+build --show_progress_rate_limit=5
+build --curses=yes --color=yes
+build --keep_going
 build --test_output=errors
 build --flaky_test_attempts=5
 build --features=race
-test --test_strategy=standalone
diff --git a/WORKSPACE b/WORKSPACE
index b921621d7..14019c4e7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_go",
-    urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.15.3/rules_go-0.15.3.tar.gz"],
-    sha256 = "97cf62bdef33519412167fd1e4b0810a318a7c234f5f8dc4f53e2da86241c492",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.15.4/rules_go-0.15.4.tar.gz",
+    sha256 = "7519e9e1c716ae3c05bd2d984a42c3b02e690c5df728dc0a84b23f90c355c5a1",
 )
 
 http_archive(