diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index fe90aa937..7e8d18e35 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -76,18 +76,31 @@ jobs:
       shell: pwsh
       run: dotnet docfx build .\docfx\docfx.json --output .\docs\
 
-    - name: Upload Pages artifact
-      uses: actions/upload-pages-artifact@v3
+    - name: Upload docs artifact
+      uses: actions/upload-artifact@v4
       with:
+        name: docs-site
         path: docs
+        retention-days: 1
 
   deploy:
     needs: docs
-    runs-on: [self-hosted, Windows, X64, L2, AX]
+    runs-on: ubuntu-latest
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
+    - name: Download docs artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: docs-site
+        path: site
+
+    - name: Upload Pages artifact
+      uses: actions/upload-pages-artifact@v3
+      with:
+        path: site
+
     - name: Deploy to GitHub Pages
       id: deployment
       uses: actions/deploy-pages@v4
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index c09282618..978935e8b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -33,18 +33,31 @@ jobs:
         shell: pwsh
         run: dotnet docfx build .\docfx\docfx.json --output .\docs\
 
-      - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v3
+      - name: Upload docs artifact
+        uses: actions/upload-artifact@v4
         with:
+          name: docs-site
           path: docs
+          retention-days: 1
 
   deploy:
     needs: build
-    runs-on: [self-hosted, Windows, X64, L2, AX]
+    runs-on: ubuntu-latest
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
+      - name: Download docs artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: docs-site
+          path: site
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: site
+
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4