diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml
index a35837a..105f9b6 100644
--- a/.github/workflows/docsgen.yml
+++ b/.github/workflows/docsgen.yml
@@ -36,9 +36,8 @@ jobs:
         echo "::add-matcher::.github/openscad_docsgen.json"
 
     - name: Generating Docs Headless
-      env:
-        OPENSCADPATH: $GITHUB_WORKSPACE/..
       run: |
+        export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
         xvfb-run --server-args="-screen 0, 1280x720x24" -a \
         openscad-docsgen -ticmI *.scad
 
diff --git a/.github/workflows/forced_docsgen.yml b/.github/workflows/forced_docsgen.yml
index d114ecc..0d70d94 100644
--- a/.github/workflows/forced_docsgen.yml
+++ b/.github/workflows/forced_docsgen.yml
@@ -34,9 +34,8 @@ jobs:
         echo "::add-matcher::.github/openscad_docsgen.json"
 
     - name: Generating Docs Headless
-      env:
-        OPENSCADPATH: $GITHUB_WORKSPACE/..
       run: |
+        export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
         xvfb-run --server-args="-screen 0, 1280x720x24" -a \
         openscad-docsgen -ticmIf *.scad
 
diff --git a/.github/workflows/testwf.yml b/.github/workflows/testwf.yml
index 9363a6d..0c33682 100644
--- a/.github/workflows/testwf.yml
+++ b/.github/workflows/testwf.yml
@@ -39,9 +39,8 @@ jobs:
         echo "cube(50, center=100);" > testwf.scad
 
     - name: TestScript
-      env:
-        OPENSCADPATH: $GITHUB_WORKSPACE/..
       run: |
+        export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
         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