diff --git a/.bazelrc b/.bazelrc
index d06421f2e6..a47392fb22 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -66,6 +66,9 @@ build:ferrocene-coverage --@rules_rust//rust/settings:extra_exec_rustc_flag=-Cco
 build:ferrocene-coverage --@rules_rust//rust/settings:extra_exec_rustc_flag=-Cdebuginfo=2
 test:ferrocene-coverage --run_under=@score_tooling//coverage:llvm_profile_wrapper
 
+# Coverage needs to have all intermediate .rlibs to be able to proceed
+build:ferrocene-coverage --remote_download_all
+
 test:unit-tests --config=linux-x86_64
 test:unit-tests --build_tests_only
 test:unit-tests --test_tag_filters=-manual
@@ -76,3 +79,6 @@ coverage --combined_report=lcov
 
 # user specific overrides (like proxy settings)
 try-import %workspace%/user.bazelrc
+
+# Try import setting from home (CI setup-bazel action for caching uses this to provide proper args like --disk-cache)
+try-import ~/.bazelrc
diff --git a/.github/workflows/test_and_docs.yml b/.github/workflows/test_and_docs.yml
index 07fcc9abd0..fde8aceb6e 100644
--- a/.github/workflows/test_and_docs.yml
+++ b/.github/workflows/test_and_docs.yml
@@ -43,12 +43,11 @@ jobs:
 
       - name: Setup Bazel
         uses: bazel-contrib/setup-bazel@0.18.0
-        # Currently disabled due to issue in testing not finding correct libraries
-        # with:
-        #   bazelisk-cache: true
-        #   disk-cache: ${{ github.workflow }}
-        #   repository-cache: true
-        #   cache-save: ${{ github.event_name == 'push' }}
+        with:
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
+          cache-save: ${{ github.event_name == 'push' }}
 
       - name: Set up Python 3
         uses: actions/setup-python@v5