diff --git a/.github/renovate.json b/.github/renovate.json
index 6f508b8..81ccb7e 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,16 +1,17 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ],
   "dependencyDashboardTitle": "Renovate Dashboard 🤖",
   "commitMessagePrefix": "🤖",
+  "commitMessageTopic": "{{depName}}",
+  "commitMessageExtra": "to {{newVersion}}",
+  "commitMessageSuffix": "",
+  "prConcurrentLimit": 0,
+  "prHourlyLimit": 0,
   "reviewers": ["chrede88"],
   "timezone": "Europe/Zurich",
-  "schedule": [
-    "after 6pm and before 6am every weekday",
-    "every weekend"
-  ],
   "customManagers": [
     {
       "description": "Update Hugo/Go version in Github actions",
diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index b94b12e..b1c0a28 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -11,8 +11,8 @@ jobs:
   enable-auto-merge:
     runs-on: ubuntu-latest
 
-    if: github.event.pull_request.user.login == 'renovate[bot]' && contains(github.event.pull_request.labels.*.name, 'auto-merge')
+    if: github.event.pull_request.user.login == 'bb-17[bot]' && contains(github.event.pull_request.labels.*.name, 'auto-merge')
     steps:
     - uses: alexwilson/enable-github-automerge-action@2.0.0
       with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml
new file mode 100644
index 0000000..e3f50c0
--- /dev/null
+++ b/.github/workflows/renovate.yaml
@@ -0,0 +1,50 @@
+---
+name: "Renovate"
+
+on:
+  workflow_dispatch:
+
+  schedule:
+    - cron: "0 * * * *" # Every hour
+  push:
+    branches: ["main"]
+    paths:
+      - .github/renovate.json
+
+permissions:
+  packages: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  LOG_LEVEL: "debug"
+  RENOVATE_AUTODISCOVER: true
+  RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}"
+  RENOVATE_PLATFORM: github
+  RENOVATE_PLATFORM_COMMIT: true
+  RENOVATE_BOT_NAME: "bb-17"
+
+jobs:
+  renovate:
+    name: Renovate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate Token
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: "${{ secrets.BOT_APP_ID }}"
+          private-key: "${{ secrets.BOT_PRIVATE_KEY }}"
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          token: "${{ steps.app-token.outputs.token }}"
+
+      - name: Renovate
+        uses: renovatebot/github-action@v40.3.4
+        with:
+          configurationFile: .github/renovate.json
+          token: "${{ steps.app-token.outputs.token }}"