diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml
index 55c404229a..ba99b14dac 100644
--- a/.github/workflows/ci_msw_cross.yml
+++ b/.github/workflows/ci_msw_cross.yml
@@ -112,8 +112,14 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Set environment variables
+      - name: System and environment setup
         run: |
+          normal_uid=`id --user`
+
+          # The checkout actions runs as root and there doesn't seem to be any
+          # way to change this, so just adjust the owner after checkout.
+          sudo chown -R $normal_uid $GITHUB_WORKSPACE
+
           echo "WINEPATH=$(winepath --windows $(pwd)/lib)" >> $GITHUB_ENV
 
           cpu_count=`nproc`