diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e594f7d036f4..17445741f07c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -80,7 +80,7 @@ jobs:
       ## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -133,7 +133,7 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -190,7 +190,7 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -229,7 +229,7 @@ jobs:
       - name: Reset existing repo
         shell: cmd
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Git Checkout
@@ -273,7 +273,7 @@ jobs:
       - name: Reset existing repo
         shell: cmd
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Git Checkout
@@ -319,7 +319,7 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -374,7 +374,7 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -391,7 +391,7 @@ jobs:
 
       - name: Test
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git submodule sync
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
@@ -431,7 +431,7 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -448,7 +448,7 @@ jobs:
 
       - name: Test
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git submodule sync
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
@@ -488,7 +488,7 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -505,7 +505,7 @@ jobs:
 
       - name: Test
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git submodule sync
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
@@ -541,7 +541,7 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -593,7 +593,7 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -648,7 +648,7 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -706,7 +706,7 @@ jobs:
     steps:
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -723,7 +723,7 @@ jobs:
 
       - name: Generate Website
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           ./project/scripts/genDocs -doc-snapshot
 
       - name: Deploy Website to https://dotty.epfl.ch
@@ -764,7 +764,7 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
@@ -844,7 +844,7 @@ jobs:
         run: |
           # We need to config safe.directory in every step that might reference git
           # It is not persisted between steps
-          git config --global --add safe.directory ${{ env.GITHUB_WORKSPACE }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
           gh release create \
           --draft \
           --title "${{ env.RELEASE_TAG }}" \