diff --git a/.renovate/commitMessage.json5 b/.renovate/commitMessage.json5
index 0250f4d7..8a331ed8 100644
--- a/.renovate/commitMessage.json5
+++ b/.renovate/commitMessage.json5
@@ -42,6 +42,18 @@
       "matchUpdateTypes": ["major"],
       "commitMessagePrefix": "feat(oci/{{#if groupName}}group/{{groupName}}{{else if (lookup (split depName '/') 2)}}{{ lookup (split depName '/') 2 }}{{#if (lookup (split depName '/') 3)}}/{{ lookup (split depName '/') 3 }}{{/if}}{{#if (lookup (split depName '/') 4)}}/{{ lookup (split depName '/') 4 }}{{/if}}{{#if (lookup (split depName '/') 5)}}/{{ lookup (split depName '/') 5 }}{{/if}}{{else if (lookup (split depName '/') 1)}}{{ lookup (split depName '/') 1 }}{{else}}{{depName}}{{/if}})!:"
     },
+    {
+      "matchDatasources": ["docker"],
+      "matchUpdateTypes": ["!major"],
+      "matchFileNames": ["**/hr.yaml", "**/helmrepo.yaml", "**/helmrelease.yaml"],
+      "semanticCommitScope": "helm/{{#if groupName}}group/{{groupName}}{{else if (lookup (split depName '/') 2)}}{{ lookup (split depName '/') 2 }}{{#if (lookup (split depName '/') 3)}}/{{ lookup (split depName '/') 3 }}{{/if}}{{#if (lookup (split depName '/') 4)}}/{{ lookup (split depName '/') 4 }}{{/if}}{{#if (lookup (split depName '/') 5)}}/{{ lookup (split depName '/') 5 }}{{/if}}{{else if (lookup (split depName '/') 1)}}{{ lookup (split depName '/') 1 }}{{else}}{{depName}}{{/if}}"
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchUpdateTypes": ["major"],
+      "matchFileNames": ["**/hr.yaml", "**/helmrepo.yaml", "**/helmrelease.yaml"],
+      "commitMessagePrefix": "feat(helm/{{#if groupName}}group/{{groupName}}{{else if (lookup (split depName '/') 2)}}{{ lookup (split depName '/') 2 }}{{#if (lookup (split depName '/') 3)}}/{{ lookup (split depName '/') 3 }}{{/if}}{{#if (lookup (split depName '/') 4)}}/{{ lookup (split depName '/') 4 }}{{/if}}{{#if (lookup (split depName '/') 5)}}/{{ lookup (split depName '/') 5 }}{{/if}}{{else if (lookup (split depName '/') 1)}}{{ lookup (split depName '/') 1 }}{{else}}{{depName}}{{/if}})!:"
+    },
     {
       "matchDatasources": ["github-releases", "github-tags"],
       "matchFileNames": [".github/workflows/**"],
diff --git a/.renovate/groups.json5 b/.renovate/groups.json5
index ebb32a5b..1691fe57 100644
--- a/.renovate/groups.json5
+++ b/.renovate/groups.json5
@@ -100,7 +100,8 @@
     {
       "description": "Immich Group",
       "groupName": "Immich",
-      "matchPackageNames": ["**immich**"],
+      "matchDatasources": ["docker", "github-tags"],
+      "matchPackageNames": ["**immich**", "ghcr.io/immich-app/**"],
       "versioning": "semver",
       "sourceUrl": "https://github.com/immich-app/immich",
       "separateMinorPatch": true
diff --git a/kube/deploy/core/hardware/node-feature-discovery/app/hr.yaml b/kube/deploy/core/hardware/node-feature-discovery/app/hr.yaml
index bc4f4431..1e0e4573 100644
--- a/kube/deploy/core/hardware/node-feature-discovery/app/hr.yaml
+++ b/kube/deploy/core/hardware/node-feature-discovery/app/hr.yaml
@@ -1,18 +1,32 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
+# yaml-language-server: $schema=https://flux.jank.ing/ocirepository-source-v1.json?test
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
 metadata:
   name: node-feature-discovery
   namespace: kube-system
 spec:
-  chart:
-    spec:
-      chart: node-feature-discovery
-      version: 0.17.3
-      sourceRef:
-        kind: HelmRepository
-        name: node-feature-discovery
-        namespace: flux-system
+  interval: 1h
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  url: oci://registry.k8s.io/nfd/charts/node-feature-discovery
+  ref:
+    tag: 0.18.0
+---
+# yaml-language-server: $schema=https://flux.jank.ing/helmrelease/v2/github/kubernetes-sigs/node-feature-discovery/master/deployment/helm/node-feature-discovery
+# TODO: change above from master to latest version tag, once a release includes values schema
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: &app node-feature-discovery
+  namespace: &ns kube-system
+spec:
+  interval: 1h
+  chartRef:
+    kind: OCIRepository
+    name: *app
+    namespace: *ns
   values:
     worker:
       config: