diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 06f248be4..602a4bdb5 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -81,6 +81,30 @@ jobs:
           name: wxPython-source
           path: dist/wxPython-${{ steps.generate.outputs.version }}.tar.gz
 
+      - name: Create demo source distribution (sdist_demo)
+        if: github.event_name == 'push'
+        run: |
+          python build.py sdist_demo
+
+      - name: Save demo sdist as job artifact
+        if: github.event_name == 'push'
+        uses: actions/upload-artifact@v4
+        with:
+          name: demo
+          path: dist/wxPython-demo-${{ steps.generate.outputs.version }}.tar.gz
+
+      - name: Build documentation
+        if: github.event_name == 'push'
+        run: |
+          python build.py wxlib sphinx bdist_docs docset_py
+
+      - name: Save docs as job artifact
+        if: github.event_name == 'push'
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs
+          path: dist/wxPython-docs*-${{ steps.generate.outputs.version }}.tar.gz
+
 
 #---------------------------------------------------------------------------
 
@@ -222,6 +246,7 @@ jobs:
     - name: Download all the dists
       uses: actions/download-artifact@v4
       with:
+        pattern: wxPython-*
         path: dist/
         merge-multiple: true
     - name: Publish distribution to PyPI