diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index d2948e36b2..656773f822 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -47,6 +47,7 @@ jobs:
             pybind11_ver: v2.12.0
             skip_build: 1
             skip_tests: 1
+            build_docs: 1
             setenvs: export EXTRA_DEP_PACKAGES="doxygen sphinx-doc"
                             PIP_INSTALLS="sphinx breathe sphinx-tabs furo"
 
@@ -98,7 +99,7 @@ jobs:
             ${{matrix.depcmds}}
             src/build-scripts/gh-installdeps.bash
       - name: Build
-        if: matrix.skip_buil != '1'
+        if: matrix.skip_build != '1'
         run: src/build-scripts/ci-build.bash
       - name: Testsuite
         if: matrix.skip_tests != '1'
@@ -120,13 +121,27 @@ jobs:
         if: matrix.abi_check != ''
         run: |
             src/build-scripts/ci-abicheck.bash ./build abi_standard/build libOpenImageIO libOpenImageIO_Util
+      - name: Build Docs
+        if: matrix.build_docs == '1'
+        run: |
+            cd src/doc
+            make doxygen
+            make sphinx
       - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         # Note: versions of upload-artifact >= 4.0 can't run on the ASWF
         # containers because they need a newer glibc than they have.
+        if: ${{ failure() || matrix.build_docs == '1'}}
         with:
-          name: oiio-docs
+          name: oiio-${{github.job}}-${{matrix.nametag}}
           path: |
+            build/cmake-save
+            build/compat_reports
             build/sphinx
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
 
 
   ubuntu: