diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 91bf6b24961..4520d990852 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -3,7 +3,8 @@
   "extends": [
     "config:base"
   ],
-  "branchName": "{{{baseBranch}}}-{{{branchTopic}}}",
+  "rebaseWhen": "behind-base-branch",
+  "branchName": "{{{baseBranch}}}-renovate-{{{branchTopic}}}",
   "addLabels": [
     "dependencies"
   ],
@@ -22,7 +23,7 @@
     "enabled": false
   },
   "lockFileMaintenance": {
-    //"automerge": true // auto-merge will be activated in a second step
+    "automerge": true
     "enabled": true,
     "addLabels": [
       "automerge",
@@ -57,7 +58,7 @@
       "enabled": false
     },
     {
-      //"automerge": true // auto-merge will be activated in a second step
+      "automerge": true
       "matchUpdateTypes": [
         "patch"
       ],
diff --git a/.github/workflows/renovate-auto-merge.yml b/.github/workflows/renovate-auto-merge.yml
index 7b3f8510002..677be39cf24 100644
--- a/.github/workflows/renovate-auto-merge.yml
+++ b/.github/workflows/renovate-auto-merge.yml
@@ -4,11 +4,14 @@ on:
     types: [ opened, synchronize, reopened ]
 jobs:
   all-checks-passed:
-    if: contains(github.event.pull_request.labels.*.name, 'automerge') && github.actor == 'renovate[bot]'
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'automerge') && github.actor == 'renovate[bot]'}}
     name: All checks passed
     runs-on: ubuntu-latest
     permissions:
       checks: read
       contents: read
+    environment: delayenv
     steps:
-      - uses: wechuli/allcheckspassed@v1.2.0
+      - uses: wechuli/allcheckspassed@v1
+        with:
+          poll: false