diff --git a/.forgejo/workflows/update-aur.yml b/.forgejo/workflows/update-aur.yml
index 55ae075..9a8eba6 100644
--- a/.forgejo/workflows/update-aur.yml
+++ b/.forgejo/workflows/update-aur.yml
@@ -38,9 +38,13 @@ jobs:
               StrictHostKeyChecking no
           EOF
 
-      - name: Sync with AUR master before changes
+      - name: Configure AUR remote and sync
         run: |
-          git remote add aur ssh://aur@aur.archlinux.org/navithingy-git.git
+          if ! git remote | grep -q "^aur$"; then
+            git remote add aur ssh://aur@aur.archlinux.org/navithingy-git.git
+          else
+            git remote set-url aur ssh://aur@aur.archlinux.org/navithingy-git.git
+          fi
           git fetch aur master
           git rebase aur/master
 
@@ -67,10 +71,6 @@ jobs:
 
       - name: Push to AUR
         run: |
-          git remote add aur ssh://aur@aur.archlinux.org/navithingy-git.git
-          git fetch aur master
-          git rebase aur/master
-
           git reset
           git add PKGBUILD .SRCINFO navithingy-git.install
 
@@ -81,4 +81,3 @@ jobs:
 
           git commit -m "Update to ${{ env.pkgver }}"
           git push aur HEAD:master
-