diff --git a/.codefresh/bazel.rc b/.codefresh/bazel.rc
index e4f8426a4f..434f22da3f 100644
--- a/.codefresh/bazel.rc
+++ b/.codefresh/bazel.rc
@@ -2,15 +2,17 @@
 # We do this by copying this file to /etc/bazel.bazelrc at the start of the build.
 # See documentation in /docs/BAZEL.md
 
-# Save downloaded repositories in a location that can be cached by CodeFresh. This helps us
-# speeding up the analysis time significantly with Bazel managed node dependencies on the CI.
-# build --repository_cache=C:/codefresh/volume/bazel_repository_cache
+# Save downloaded repositories in a location that can be cached by CodeFresh and shared between
+# builds. This helps speed up the analysis time significantly with Bazel managed node dependencies
+# on the CI.
+# https://codefresh.io/docs/docs/configure-ci-cd-pipeline/introduction-to-codefresh-pipelines/#caching-the-artifacts-of-your-build-system
+build --repository_cache=C:/codefresh/volume/bazel_repository_cache
 
 # Don't be spammy in the logs
 # TODO(gmagolan): Hide progress again once build performance improves
 # Presently, CircleCI can timeout during bazel test ... with the following
 # error: Too long with no output (exceeded 10m0s)
-# build --noshow_progress
+build --noshow_progress
 
 # Print all the options that apply to the build.
 # This helps us diagnose which options override others
@@ -34,6 +36,10 @@ build --verbose_failures=true
 build --action_env=PATH
 test --action_env=PATH --test_env=PATH
 
+# Disable watchfs on Windows as it causes tests to be flaky
+# https://github.com/angular/angular/issues/29541
+build --nowatchfs
+
 # Exclude tests known to not work on Windows.
 
 # Chrome web tests are currently broken.