diff --git a/.bazelrc b/.bazelrc
index aa0982d47068..7e4a11b80711 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -40,6 +40,9 @@ build:remote --define=EXECUTOR=remote
 build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
 build:remote --remote_timeout=3600
 
+# Improve cache hit rate
+build:remote --incompatible_strict_action_env=true
+
 # Minimize what is downloaded
 build:inmemory --experimental_inmemory_jdeps_files
 build:inmemory --experimental_inmemory_dotd_files
diff --git a/prow/interrupts/BUILD.bazel b/prow/interrupts/BUILD.bazel
index 1bb98423e1fc..2a2207463a40 100644
--- a/prow/interrupts/BUILD.bazel
+++ b/prow/interrupts/BUILD.bazel
@@ -26,4 +26,5 @@ go_test(
     name = "go_default_test",
     srcs = ["interrupts_test.go"],
     embed = [":go_default_library"],
+    tags = ["local"],  # TODO(fejta): non-hermetic tests fails on RBE
 )
diff --git a/prow/metrics/BUILD.bazel b/prow/metrics/BUILD.bazel
index 8ab633862afb..a3f292faee78 100644
--- a/prow/metrics/BUILD.bazel
+++ b/prow/metrics/BUILD.bazel
@@ -46,6 +46,7 @@ go_test(
         "metrics_test.go",
     ],
     embed = [":go_default_library"],
+    tags = ["local"],  # TODO(fejta): non-hermetic tests fails on RBE
     deps = [
         "//prow/config:go_default_library",
         "@io_k8s_utils//diff:go_default_library",
diff --git a/prow/metrics/metrics_test.go b/prow/metrics/metrics_test.go
index 4772f614f1a4..7176f2eb1b84 100644
--- a/prow/metrics/metrics_test.go
+++ b/prow/metrics/metrics_test.go
@@ -27,7 +27,7 @@ func TestExposeMetrics(t *testing.T) {
 	ExposeMetrics("my-component", config.PushGateway{})
 	resp, err := http.Get("http://127.0.0.1:9090/metrics")
 	if err != nil {
-		t.Errorf("failed getting metrics: %v", err)
+		t.Fatalf("failed getting metrics: %v", err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("resonse status was not 200 but %d", resp.StatusCode)