diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml
index 92deef1..627aeba 100644
--- a/.github/workflows/docsgen.yml
+++ b/.github/workflows/docsgen.yml
@@ -34,13 +34,18 @@ jobs:
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
 
-    - name: Generating Docs
+    - name: Generating Docs Headless
+      uses: GabrielBB/xvfb-action@v1
+      with:
+        working-directory: $GITHUB_WORKSPACE
+        run: |
+          export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
+          echo "::add-matcher::.github/openscad_docsgen.json"
+          openscad-docsgen -ticmI *.scad
+
+    - name: Commit Wiki Docs
       run: |
-        cd $GITHUB_WORKSPACE
-        export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
-        echo "::add-matcher::.github/openscad_docsgen.json"
-        openscad-docsgen -ticmI *.scad
-        cd BOSL2.wiki
+        cd $GITHUB_WORKSPACE/BOSL2.wiki
         git config user.name github-actions
         git config user.email github-actions@github.com
         git add --all
diff --git a/.github/workflows/forced_docsgen.yml b/.github/workflows/forced_docsgen.yml
index d9a7ebc..cc318f0 100644
--- a/.github/workflows/forced_docsgen.yml
+++ b/.github/workflows/forced_docsgen.yml
@@ -32,13 +32,18 @@ jobs:
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
 
-    - name: Generating Docs
+    - name: Generating Docs Headless
+      uses: GabrielBB/xvfb-action@v1
+      with:
+        working-directory: $GITHUB_WORKSPACE
+        run: |
+          export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
+          echo "::add-matcher::.github/openscad_docsgen.json"
+          openscad-docsgen -ticmIf *.scad
+
+    - name: Commit Wiki Docs
       run: |
-        cd $GITHUB_WORKSPACE
-        export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
-        echo "::add-matcher::.github/openscad_docsgen.json"
-        openscad-docsgen -ticmIf *.scad
-        cd BOSL2.wiki
+        cd $GITHUB_WORKSPACE/BOSL2.wiki
         git config user.name github-actions
         git config user.email github-actions@github.com
         git add --all
diff --git a/.github/workflows/testwf.yml b/.github/workflows/testwf.yml
index af79a88..a6d5774 100644
--- a/.github/workflows/testwf.yml
+++ b/.github/workflows/testwf.yml
@@ -33,10 +33,13 @@ jobs:
         sudo chmod +x /usr/local/bin/openscad
 
     - name: TestScript
-      run: |
-        cd $GITHUB_WORKSPACE
-        export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
-        echo "::add-matcher::.github/openscad_docsgen.json"
-        echo "cube(50, center=100);" > testwf.scad
-        openscad -o tmp_cube.png --imgsize=640,480 --view=axes,scales --projection=o --autocenter --viewall --preview '' --hardwarnings testwf.scad
+      uses: GabrielBB/xvfb-action@v1
+      with:
+        working-directory: $GITHUB_WORKSPACE
+        run: |
+          cd $GITHUB_WORKSPACE
+          export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
+          echo "::add-matcher::.github/openscad_docsgen.json"
+          echo "cube(50, center=100);" > testwf.scad
+          openscad -o tmp_cube.png --imgsize=640,480 --view=axes,scales --projection=o --autocenter --viewall --preview '' --hardwarnings testwf.scad