diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
index c0786a3c6c..e8d3e05499 100644
--- a/.github/workflows/update-nightly.yml
+++ b/.github/workflows/update-nightly.yml
@@ -17,11 +17,12 @@ jobs:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Nightly Update
         run: anda update -vv --filters nightly=1
@@ -30,7 +31,6 @@ jobs:
 
       - name: Save
         run: |
-          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 358716c0fb..9ee672acc3 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -17,11 +17,12 @@ jobs:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Update
         run: anda update -vv
@@ -31,7 +32,6 @@ jobs:
 
       - name: Save
         run: |
-          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"