diff --git a/.bazelrc.common b/.bazelrc.common
index 6b32043ac..73c11a427 100644
--- a/.bazelrc.common
+++ b/.bazelrc.common
@@ -64,6 +64,7 @@ build:ci-common --experimental_repository_cache_hardlinks
 
 # Use a remote cache during CI
 build:ci-windows-bindist --bes_upload_mode=wait_for_upload_complete --bes_timeout=60s
+build:ci-windows-bindist --experimental_build_event_upload_max_retries=256
 build:remote-cache --remote_cache=grpcs://remote.buildbuddy.io
 build:ci-common --remote_timeout=3600
 # Avoid failures of the form `deadline exceeded after 14999958197ns DEADLINE_EXCEEDED`.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 255527635..2b7c9413d 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -103,6 +103,11 @@ jobs:
         bzlmod: [bzlmod, workspace]
     runs-on: ${{ matrix.os }}
     steps:
+      - if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          reg query HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
+          reg add HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters /v KeepAliveTime /t REG_DWORD /d 300000
+          reg query HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
       - if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |-
           sudo swapoff -a
@@ -199,3 +204,29 @@ jobs:
           # NOTE keep in sync with tests/RunTests.hs
           bazel run @stackage-pinning-test-unpinned//:pin
           bazel build @stackage-pinning-test//:hspec
+
+      - name: Collect logs
+        if: always()
+        shell: bash
+        run: |
+          mkdir -p logs
+          export PATH=$HOME/bazel:$PATH
+          base=$( bazel info output_base )
+          find "$base" -mindepth 1 -maxdepth 1 -name "java*.log.*" -print0 | xargs -0r cp -t logs
+
+      - name: Collect logs
+        if: always()
+        shell: bash
+        run: |
+          mkdir -p logs
+          export PATH=$HOME/bazel:$PATH
+          cd rules_haskell_tests
+          base=$( bazel info output_base )
+          find "$base" -mindepth 1 -maxdepth 1 -name "java*.log.*" -print0 | xargs -0r cp -t ../logs
+
+      - name: Upload logs
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: Logs ${{ matrix.os }} ${{ matrix.module }} ${{ matrix.bzlmod }}
+          path: logs