diff --git a/.buildkite-bazelrc b/.buildkite-bazelrc
index a9c0c72cb..c53ac4df6 100644
--- a/.buildkite-bazelrc
+++ b/.buildkite-bazelrc
@@ -2,7 +2,7 @@
 # across machines, developers, and workspaces.
 # 
 # This config is loaded from https://github.com/bazelbuild/bazel-toolchains/blob/master/bazelrc/latest.bazelrc
-build:remote-cache --remote_timeout=3600
+#build:remote-cache --remote_timeout=3600
 #build:remote-cache --spawn_strategy=standalone
 #build:remote-cache --strategy=Javac=standalone
 #build:remote-cache --strategy=Closure=standalone
@@ -10,7 +10,9 @@ build:remote-cache --remote_timeout=3600
 
 # Prysm specific remote-cache properties.
 #build:remote-cache --disk_cache=
-build:remote-cache --remote_download_minimal
+#build:remote-cache --remote_download_minimal
+build:remote-cache --remote_cache=grpc://bazel-remote-cache:9092
+build:remote-cache --remote_local_fallback
 
 # Import workspace options.
 import %workspace%/.bazelrc