diff --git a/.github/workflows/build_package_on_demand.yml b/.github/workflows/build_package_on_demand.yml
index 70e89d72..52da9e96 100644
--- a/.github/workflows/build_package_on_demand.yml
+++ b/.github/workflows/build_package_on_demand.yml
@@ -11,10 +11,11 @@ jobs:
       uses: actions/checkout@v2
       with:
         path: buildsrc
-    - name: Set ownership of buildsrc
-      run: sudo chown -R 1000 buildsrc
-    - name: Create empty repo directory
-      run: sudo install -d -o 1000 -g users repo
+    - name: Prepare build environment
+      run: |
+        sudo chown -R 1000 buildsrc
+        sudo chown -R $(id -u) buildsrc/.git
+        sudo install -d -o 1000 -g users repo
     - name: Use geschenkerbauer to build packages
       uses: mutantmonkey/geschenkerbauer/action@master
       env:
diff --git a/.github/workflows/build_updated_packages.yml b/.github/workflows/build_updated_packages.yml
index 9911510b..b856b81f 100644
--- a/.github/workflows/build_updated_packages.yml
+++ b/.github/workflows/build_updated_packages.yml
@@ -10,10 +10,11 @@ jobs:
       with:
         path: buildsrc
         fetch-depth: 0
-    - name: Set ownership of buildsrc
-      run: sudo chown -R 1000 buildsrc
-    - name: Create empty repo directory
-      run: sudo install -d -o 1000 -g users repo
+    - name: Prepare build environment
+      run: |
+        sudo chown -R 1000 buildsrc
+        sudo chown -R $(id -u) buildsrc/.git
+        sudo install -d -o 1000 -g users repo
     - name: Figure out which packages have changed since the last push
       id: get-packages
       run: |