diff --git a/Passwords.kdbx b/Passwords.kdbx
index 3d2ccef..54093c2 100644
Binary files a/Passwords.kdbx and b/Passwords.kdbx differ
diff --git a/kargo-projects/orchestration-stack/orch-promotion-template.yaml b/kargo-projects/orchestration-stack/orch-promotion-template.yaml
index e741d6c..0ef5e8a 100644
--- a/kargo-projects/orchestration-stack/orch-promotion-template.yaml
+++ b/kargo-projects/orchestration-stack/orch-promotion-template.yaml
@@ -56,6 +56,7 @@ spec:
         repoURL: ${{ vars.repoUrl }}
         provider: "gitea"
         prNumber: ${{ task.outputs['open-pr'].pr.id }}
+        mergeMethod: "rebase"
         wait: true
     - uses: git-wait-for-pr
       if: "${{ status('open-pr') != 'Skipped'}}"