diff --git a/.github/renovate.json b/.github/renovate.json
index 1d2cd470e..2f4b4f75b 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -10,16 +10,8 @@
     {
       "fileMatch": ["\\.yaml$"],
       "matchStrings": [
-        "# ?renovate image=(?<depName>.+)\\n.+: [\"']?(?<currentValue>.+?)[\"']?\\n"
-      ],
-      "datasourceTemplate": "docker"
-    },
-    {
-      "fileMatch": ["\\.github/workflows/.*\\.yaml$"],
-      "matchStrings": [
-        "# ?renovate github-repo=(?<depName>.+)\\n.+: [\"']?(?<currentValue>.+?)[\"']?\\n"
-      ],
-      "datasourceTemplate": "github-releases"
+        "# ?renovate datasource=(?<datasource>.+?) depName=(?<depName>.+)\\n.+: [\"']?(?<currentValue>.+?)[\"']?\\n"
+      ]
     }
   ],
   "packageRules": [
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 96d9c430c..0d38ad366 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -55,7 +55,7 @@ jobs:
       - name: Set up mdBook
         uses: peaceiris/actions-mdbook@v1
         with:
-          # renovate github-repo=rust-lang/mdBook
+          # renovate datasource=github-releases depName=rust-lang/mdBook
           mdbook-version: "0.4.27"
 
       - name: Build docs
diff --git a/charts/ascii-telnet/Chart.yaml b/charts/ascii-telnet/Chart.yaml
index 1e2c6ffad..8aae678c5 100644
--- a/charts/ascii-telnet/Chart.yaml
+++ b/charts/ascii-telnet/Chart.yaml
@@ -4,7 +4,7 @@ description: Star Wars telnet server
 home: https://charts.gabe565.com/charts/ascii-telnet
 type: application
 version: 0.3.1
-# renovate image=ghcr.io/gabe565/ascii-telnet-go
+# renovate datasource=docker depName=ghcr.io/gabe565/ascii-telnet-go
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/bookstack/Chart.yaml b/charts/bookstack/Chart.yaml
index c4d0803c1..61b488040 100644
--- a/charts/bookstack/Chart.yaml
+++ b/charts/bookstack/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/bookstack
 icon: https://raw.githubusercontent.com/gabe565/charts/main/charts/bookstack/icon.svg
 type: application
 version: 0.4.1
-# renovate image=ghcr.io/linuxserver/bookstack
+# renovate datasource=docker depName=ghcr.io/linuxserver/bookstack
 appVersion: version-v23.01.1
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/borgmatic/Chart.yaml b/charts/borgmatic/Chart.yaml
index 22111048a..6a93ff87e 100644
--- a/charts/borgmatic/Chart.yaml
+++ b/charts/borgmatic/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/borgmatic
 icon: https://raw.githubusercontent.com/borgmatic-collective/borgmatic/1.6.6/docs/static/borgmatic.svg
 type: application
 version: 0.6.1
-# renovate image=b3vis/borgmatic
+# renovate datasource=docker depName=b3vis/borgmatic
 appVersion: 1.7.6
 kubeVersion: ">=1.21.0-0"
 keywords:
diff --git a/charts/changedetection-io/Chart.yaml b/charts/changedetection-io/Chart.yaml
index 043867995..89bc24c3b 100644
--- a/charts/changedetection-io/Chart.yaml
+++ b/charts/changedetection-io/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/changedetection-io
 icon: https://raw.githubusercontent.com/gabe565/charts/main/charts/changedetection-io/icon.png
 type: application
 version: 0.4.1
-# renovate image=ghcr.io/dgtlmoon/changedetection.io
+# renovate datasource=docker depName=ghcr.io/dgtlmoon/changedetection.io
 appVersion: 0.40.1.1
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/domain-watch/Chart.yaml b/charts/domain-watch/Chart.yaml
index 9d5621899..ad0c52153 100644
--- a/charts/domain-watch/Chart.yaml
+++ b/charts/domain-watch/Chart.yaml
@@ -4,7 +4,7 @@ description: Tool to watch whois reports and notify when statuses change or expi
 home: https://charts.gabe565.com/charts/domain-watch
 type: application
 version: 0.3.1
-# renovate image=ghcr.io/gabe565/domain-watch
+# renovate datasource=docker depName=ghcr.io/gabe565/domain-watch
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/flame/Chart.yaml b/charts/flame/Chart.yaml
index 253d8b810..2a6f624fc 100644
--- a/charts/flame/Chart.yaml
+++ b/charts/flame/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/flame
 icon: https://raw.githubusercontent.com/pawelmalak/flame/4ed29fe276b4282c67415f9788660df2a3a69b5c/client/public/icons/apple-touch-icon-180x180.png
 type: application
 version: 0.3.1
-# renovate image=pawelmalak/flame
+# renovate datasource=docker depName=pawelmalak/flame
 appVersion: multiarch2.3.0
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/hammond/Chart.yaml b/charts/hammond/Chart.yaml
index 44e560786..ab0d3fe26 100644
--- a/charts/hammond/Chart.yaml
+++ b/charts/hammond/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/hammond
 icon: https://raw.githubusercontent.com/akhilrex/hammond/84cba2c7f26f6d3f81c49b132110b24ac97c7b49/ui/public/touch-icon.png
 type: application
 version: 0.3.1
-# renovate image=akhilrex/hammond
+# renovate datasource=docker depName=akhilrex/hammond
 appVersion: 1.0.0
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/headscale/Chart.yaml b/charts/headscale/Chart.yaml
index 4bd7d5c9b..d950d7029 100644
--- a/charts/headscale/Chart.yaml
+++ b/charts/headscale/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/headscale
 icon: https://raw.githubusercontent.com/juanfont/headscale/641c6fd439a915150db3c2e83928e289b7e0c9d2/docs/logo/headscale3-dots.png
 type: application
 version: 0.8.2
-# renovate image=ghcr.io/juanfont/headscale
+# renovate datasource=docker depName=ghcr.io/juanfont/headscale
 appVersion: 0.20.0
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/home-assistant/Chart.yaml b/charts/home-assistant/Chart.yaml
index 8cd12adab..2fe55d402 100644
--- a/charts/home-assistant/Chart.yaml
+++ b/charts/home-assistant/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/home-assistant/
 icon: https://raw.githubusercontent.com/home-assistant/assets/master/logo/logo-pretty.png
 type: application
 version: 0.0.4
-# renovate image=ghcr.io/home-assistant/home-assistant
+# renovate datasource=docker depName=ghcr.io/home-assistant/home-assistant
 appVersion: 2023.2.5
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/homer/Chart.yaml b/charts/homer/Chart.yaml
index 86e7c2be3..c1243bc21 100644
--- a/charts/homer/Chart.yaml
+++ b/charts/homer/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/homer
 icon: https://raw.githubusercontent.com/bastienwirtz/homer/5418c6291a39d27aeee471673adba742080e1ccb/public/logo.png
 type: application
 version: 0.4.0
-# renovate image=b4bz/homer
+# renovate datasource=docker depName=b4bz/homer
 appVersion: v23.02.1
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/limo/Chart.yaml b/charts/limo/Chart.yaml
index 4d510583e..d35e3a66c 100644
--- a/charts/limo/Chart.yaml
+++ b/charts/limo/Chart.yaml
@@ -4,7 +4,7 @@ description: A file upload server.
 home: https://charts.gabe565.com/charts/limo
 type: application
 version: 0.4.2
-# renovate image=ghcr.io/gabe565/limo
+# renovate datasource=docker depName=ghcr.io/gabe565/limo
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 dependencies:
diff --git a/charts/matrimony/Chart.yaml b/charts/matrimony/Chart.yaml
index dc9f715d6..40f4f979c 100644
--- a/charts/matrimony/Chart.yaml
+++ b/charts/matrimony/Chart.yaml
@@ -4,7 +4,7 @@ description: Self-hosted wedding site configured via YAML
 home: https://charts.gabe565.com/charts/matrimony
 type: application
 version: 0.3.2
-# renovate image=ghcr.io/gabe565/matrimony
+# renovate datasource=docker depName=ghcr.io/gabe565/matrimony
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 dependencies:
diff --git a/charts/miniflux/Chart.yaml b/charts/miniflux/Chart.yaml
index cf1977e41..d0ffe9edf 100644
--- a/charts/miniflux/Chart.yaml
+++ b/charts/miniflux/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/miniflux
 icon: https://raw.githubusercontent.com/miniflux/logo/40cb83cc5b190212ad29fb4d5db6b52b335e4dc2/icon.svg
 type: application
 version: 0.4.2
-# renovate image=miniflux/miniflux
+# renovate datasource=docker depName=miniflux/miniflux
 appVersion: 2.0.42
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/mnemonic-ninja/Chart.yaml b/charts/mnemonic-ninja/Chart.yaml
index c506bd4b8..e1b331eae 100644
--- a/charts/mnemonic-ninja/Chart.yaml
+++ b/charts/mnemonic-ninja/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/mnemonic-ninja
 icon: https://raw.githubusercontent.com/gabe565/mnemonic-ninja/20b5c559fb0147c5f3c0c1cc5a3841d371259b78/frontend/src/assets/logo.svg
 type: application
 version: 0.3.2
-# renovate image=ghcr.io/gabe565/mnemonic-ninja
+# renovate datasource=docker depName=ghcr.io/gabe565/mnemonic-ninja
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 dependencies:
diff --git a/charts/monica/Chart.yaml b/charts/monica/Chart.yaml
index 9c1bb2bc6..9789d7e07 100644
--- a/charts/monica/Chart.yaml
+++ b/charts/monica/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/monica
 icon: https://raw.githubusercontent.com/monicahq/monica/main/public/img/monica.svg
 type: application
 version: 0.4.2
-# renovate image=monica
+# renovate datasource=docker depName=monica
 appVersion: 4.0.0-fpm-alpine
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/nightscout/Chart.yaml b/charts/nightscout/Chart.yaml
index a5a55c083..8d9f776a3 100644
--- a/charts/nightscout/Chart.yaml
+++ b/charts/nightscout/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/nightscout
 icon: https://raw.githubusercontent.com/nightscout/cgm-remote-monitor/71c2363b7be387cda899669be2bfd6ddbfe70198/static/images/large.png
 type: application
 version: 0.5.3
-# renovate image=nightscout/cgm-remote-monitor
+# renovate datasource=docker depName=nightscout/cgm-remote-monitor
 appVersion: 14.2.6
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/pictshare/Chart.yaml b/charts/pictshare/Chart.yaml
index abd7a2c5d..ba8958ee8 100644
--- a/charts/pictshare/Chart.yaml
+++ b/charts/pictshare/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/pictshare
 icon: https://camo.githubusercontent.com/6efdab1c63d518fafc5e735001c5ed45e7cbd4958952cdd972e2630eee881d97/68747470733a2f2f7069637473686172652e6e65742f706868796e6a2e706e67
 type: application
 version: 0.3.1
-# renovate image=hascheksolutions/pictshare
+# renovate datasource=docker depName=hascheksolutions/pictshare
 appVersion: 72394f17
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/podgrab/Chart.yaml b/charts/podgrab/Chart.yaml
index c5e694892..cf4d47339 100644
--- a/charts/podgrab/Chart.yaml
+++ b/charts/podgrab/Chart.yaml
@@ -4,7 +4,7 @@ description: A self-hosted podcast manager to download episodes as soon as they
 home: https://charts.gabe565.com/charts/podgrab
 type: application
 version: 0.3.1
-# renovate image=ghcr.io/akhilrex/podgrab
+# renovate datasource=docker depName=ghcr.io/akhilrex/podgrab
 appVersion: 1.0.0
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/portfolio/Chart.yaml b/charts/portfolio/Chart.yaml
index 5e138f277..ef2571fe5 100644
--- a/charts/portfolio/Chart.yaml
+++ b/charts/portfolio/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/portfolio
 icon: https://raw.githubusercontent.com/gabe565/portfolio/0f0e80ce2f29e9382a64e7fc6fe2ed1a9993971b/public/android-chrome-512x512.png
 type: application
 version: 0.5.3
-# renovate image=ghcr.io/gabe565/portfolio
+# renovate datasource=docker depName=ghcr.io/gabe565/portfolio
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 dependencies:
diff --git a/charts/relax-sounds/Chart.yaml b/charts/relax-sounds/Chart.yaml
index 7ee5e70be..a05bb75bf 100644
--- a/charts/relax-sounds/Chart.yaml
+++ b/charts/relax-sounds/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/relax-sounds
 icon: https://raw.githubusercontent.com/gabe565/relax-sounds/93681cad1585cd14203a39c6b3c5de525f30619e/frontend/public/img/icons/android-chrome-512x512.png
 type: application
 version: 0.3.2
-# renovate image=ghcr.io/gabe565/relax-sounds
+# renovate datasource=docker depName=ghcr.io/gabe565/relax-sounds
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 dependencies:
diff --git a/charts/rss-bridge/Chart.yaml b/charts/rss-bridge/Chart.yaml
index d19f87097..ba21ef19e 100644
--- a/charts/rss-bridge/Chart.yaml
+++ b/charts/rss-bridge/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/rss-bridge
 icon: https://raw.githubusercontent.com/RSS-Bridge/rss-bridge/987f42d6d44cc18e5c33441e742d15ffff6feb72/static/favicon.png
 type: application
 version: 0.3.2
-# renovate image=ghcr.io/rss-bridge/rss-bridge
+# renovate datasource=docker depName=ghcr.io/rss-bridge/rss-bridge
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/rsshub/Chart.yaml b/charts/rsshub/Chart.yaml
index b4324e595..7675f9e9d 100644
--- a/charts/rsshub/Chart.yaml
+++ b/charts/rsshub/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/rsshub
 icon: https://camo.githubusercontent.com/79f2dcf6fb41b71619186b12eed25495fa55e20d3f21355798a2cb22703c6f8b/68747470733a2f2f692e6c6f6c692e6e65742f323031392f30342f32332f356362656237653431343134632e706e67
 type: application
 version: 0.3.3
-# renovate image=diygod/rsshub
+# renovate datasource=docker depName=diygod/rsshub
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/scanservjs/Chart.yaml b/charts/scanservjs/Chart.yaml
index 4e7c4a2bd..3cbc4a1e2 100644
--- a/charts/scanservjs/Chart.yaml
+++ b/charts/scanservjs/Chart.yaml
@@ -4,7 +4,7 @@ description: scanservjs is a web UI frontend for your scanner. It allows you to
 home: https://charts.gabe565.com/charts/scanservjs
 type: application
 version: 0.4.3
-# renovate image=sbs20/scanservjs
+# renovate datasource=docker depName=sbs20/scanservjs
 appVersion: release-v2.25.2
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/smarter-device-manager/Chart.yaml b/charts/smarter-device-manager/Chart.yaml
index c5982e8c2..96458010f 100644
--- a/charts/smarter-device-manager/Chart.yaml
+++ b/charts/smarter-device-manager/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/smarter-device-manager
 icon: https://gitlab.com/uploads/-/system/group/avatar/6339043/ARM1636_Project_Logo_ST2_RGB_V1.png
 type: application
 version: 0.3.1
-# renovate image=registry.gitlab.com/arm-research/smarter/smarter-device-manager
+# renovate datasource=docker depName=registry.gitlab.com/arm-research/smarter/smarter-device-manager
 appVersion: v1.20.11
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/tandoor/Chart.yaml b/charts/tandoor/Chart.yaml
index 2cf198e17..559284f5d 100644
--- a/charts/tandoor/Chart.yaml
+++ b/charts/tandoor/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/tandoor
 icon: https://raw.githubusercontent.com/vabene1111/recipes/master/docs/logo_color.svg
 type: application
 version: 0.4.4
-# renovate image=vabene1111/recipes
+# renovate datasource=docker depName=vabene1111/recipes
 appVersion: 1.4.7
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/transsmute/Chart.yaml b/charts/transsmute/Chart.yaml
index 25283619d..aad630322 100644
--- a/charts/transsmute/Chart.yaml
+++ b/charts/transsmute/Chart.yaml
@@ -4,7 +4,7 @@ description: Transsmute builds RSS feeds for websites that don't provide them.
 home: https://charts.gabe565.com/charts/transsmute
 type: application
 version: 0.3.1
-# renovate image=ghcr.io/gabe565/transsmute
+# renovate datasource=docker depName=ghcr.io/gabe565/transsmute
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 keywords:
diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
index b9ed4c9cb..5bf4cb760 100644
--- a/charts/vaultwarden/Chart.yaml
+++ b/charts/vaultwarden/Chart.yaml
@@ -5,7 +5,7 @@ home: https://charts.gabe565.com/charts/vaultwarden
 icon: https://raw.githubusercontent.com/dani-garcia/vaultwarden/d57b69952db6eb12987a9668fea6b72df79cfa41/resources/vaultwarden-icon.svg
 type: application
 version: 0.4.2
-# renovate image=vaultwarden/server
+# renovate datasource=docker depName=vaultwarden/server
 appVersion: 1.27.0-alpine
 kubeVersion: ">=1.22.0-0"
 keywords: