diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml
index 435a0d0..a35837a 100644
--- a/.github/workflows/docsgen.yml
+++ b/.github/workflows/docsgen.yml
@@ -36,11 +36,11 @@ jobs:
         echo "::add-matcher::.github/openscad_docsgen.json"
 
     - name: Generating Docs Headless
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        working-directory: $GITHUB_WORKSPACE
-        run: |
-          OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) openscad-docsgen -ticmI *.scad
+      env:
+        OPENSCADPATH: $GITHUB_WORKSPACE/..
+      run: |
+        xvfb-run --server-args="-screen 0, 1280x720x24" -a \
+        openscad-docsgen -ticmI *.scad
 
     - name: Commit Wiki Docs
       run: |
diff --git a/.github/workflows/forced_docsgen.yml b/.github/workflows/forced_docsgen.yml
index 51aa1c0..d114ecc 100644
--- a/.github/workflows/forced_docsgen.yml
+++ b/.github/workflows/forced_docsgen.yml
@@ -34,11 +34,11 @@ jobs:
         echo "::add-matcher::.github/openscad_docsgen.json"
 
     - name: Generating Docs Headless
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        working-directory: $GITHUB_WORKSPACE
-        run: |
-          OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) openscad-docsgen -ticmIf *.scad
+      env:
+        OPENSCADPATH: $GITHUB_WORKSPACE/..
+      run: |
+        xvfb-run --server-args="-screen 0, 1280x720x24" -a \
+        openscad-docsgen -ticmIf *.scad
 
     - name: Commit Wiki Docs
       run: |
diff --git a/.github/workflows/testwf.yml b/.github/workflows/testwf.yml
index 6af9c4a..9363a6d 100644
--- a/.github/workflows/testwf.yml
+++ b/.github/workflows/testwf.yml
@@ -39,9 +39,9 @@ jobs:
         echo "cube(50, center=100);" > testwf.scad
 
     - name: TestScript
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        working-directory: $GITHUB_WORKSPACE
-        run: |
-          OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) openscad -o tmp_cube.png --imgsize=640,480 --view=axes,scales --projection=o --autocenter --viewall --preview '' --hardwarnings testwf.scad
+      env:
+        OPENSCADPATH: $GITHUB_WORKSPACE/..
+      run: |
+        xvfb-run --server-args="-screen 0, 1280x720x24" -a \
+        openscad -o tmp_cube.png --imgsize=640,480 --view=axes,scales --projection=o --autocenter --viewall --preview '' --hardwarnings testwf.scad