diff --git a/.github/workflows/doc-tests.yml b/.github/workflows/doc-tests.yml
index ff778ec58f..b06bead030 100644
--- a/.github/workflows/doc-tests.yml
+++ b/.github/workflows/doc-tests.yml
@@ -34,7 +34,7 @@ jobs:
         builder-command:
         - 'spelling . spelling -W --keep-going'
         # -vv is too verbose and makes it hard to read logs
-        - 'linkcheck -v . links'
+        - 'linkcheck -vv . links'
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
@@ -52,5 +52,9 @@ jobs:
       # TODO: find way to split up dependencies
       run: python -m pip install -r doc/requirements.txt
     - name: Run builder
+      id: builder
       run: sphinx-build -b ${{ matrix.builder-command }}
       working-directory: doc
+    - if: ${{ !cancelled() && steps.builder.outcome == 'failure' }}
+      run: sphinx-build --bug-report
+      working-directory: doc
diff --git a/doc/conf.py b/doc/conf.py
index 171c556781..0f030e1bcb 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -269,4 +269,5 @@ def __getattr__(cls, name):
     "https://docs.aerospike.com/server/guide/security/index.html"
 ]
 
-linkcheck_timeout = 120
+linkcheck_timeout = 30
+linkcheck_retries = 4