diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 2555276357..e4065e5a94 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -199,3 +199,18 @@ 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: |
+          base=$( bazel info output_base )
+          cd "$base"
+          find -maxdepth 1 -name "java*.log.*" -print0 | xargs -0r tar --force-local -caf "$GITHUB_WORKSPACE/logs.tgz"
+
+      - name: Upload logs
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: Logs ${{ matrix.os }} ${{ matrix.module }} ${{ matrix.bzlmod }}
+          path: logs.tgz