diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7112beb26..163cd8e9f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Run Playwright tests
         run: pnpm test
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         if: always()
         with:
           name: playwright-report
diff --git a/renovate.json b/renovate.json
index a73b51d10..b91cbaa0b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -3,6 +3,7 @@
   "extends": [
     "config:base"
   ],
+  "rebaseWhen": "behind-base-branch",
   "rangeStrategy": "bump",
   "packageRules": [
     {
@@ -18,6 +19,13 @@
         "semantic-release-version-mirror/package.json"
       ],
       "automerge": true
+    },
+    {
+      "matchManagers": [
+        "github-actions"
+      ],
+      "automerge": true,
+      "automergeType": "pr"
     }
   ]
 }