chore(deps): update dependency foldergram/foldergram to v1.0.9

.gitea/workflows/renovate.yaml

@@ -13,7 +13,7 @@ on:
 jobs:
   renovate:
     runs-on: ubuntu-latest
-    container: ghcr.io/renovatebot/renovate:43.99.1@sha256:06e7b4c3b24c79f75f47a8f4a4d5401d6fe741985b6a25b5a07472d184b78993
+    container: ghcr.io/renovatebot/renovate:43.99.0@sha256:aae697086b93427dcde46eb92e08e334b018946ce19339bf044ce971ca1626e2
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

clusters/cl01tl/helm/code-server/values.yaml

@@ -28,7 +28,7 @@ code-server:
           resources:
             requests:
               cpu: 1m
-              memory: 40Mi
+              memory: 50Mi
   service:
     main:
       controller: main

clusters/cl01tl/helm/directus/values.yaml

@@ -143,7 +143,7 @@ directus:
           resources:
             requests:
               cpu: 10m
-              memory: 300Mi
+              memory: 1Gi
   service:
     main:
       controller: main

clusters/cl01tl/helm/foldergram/values.yaml

@@ -12,7 +12,7 @@ foldergram:
         main:
           image:
             repository: ghcr.io/foldergram/foldergram
-            tag: 1.0.9@sha256:aa6707e7456386f2d74b8f2769d0281f4127d1276349583b8531dbaa8f844883
+            tag: 1.0.8@sha256:3546dc1da4ec12cb27aaecbf77896d708ac7601eb0225e0f6e181d7ef35273f9
             pullPolicy: IfNotPresent
           env:
             - name: IMAGE_DETAIL_SOURCE

clusters/cl01tl/helm/freshrss/values.yaml

@@ -79,7 +79,7 @@ freshrss:
           resources:
             requests:
               cpu: 1m
-              memory: 100Mi
+              memory: 128Mi
   service:
     main:
       controller: main

clusters/cl01tl/helm/garage/values.yaml

@@ -28,7 +28,7 @@ garage:
           resources:
             requests:
               cpu: 10m
-              memory: 200Mi
+              memory: 400Mi
     server-2:
       type: deployment
       replicas: 1
@@ -57,7 +57,7 @@ garage:
           resources:
             requests:
               cpu: 10m
-              memory: 200Mi
+              memory: 400Mi
     server-3:
       type: deployment
       replicas: 1
@@ -86,7 +86,7 @@ garage:
           resources:
             requests:
               cpu: 10m
-              memory: 200Mi
+              memory: 400Mi
     webui:
       type: deployment
       replicas: 1

clusters/cl01tl/helm/grafana-operator/templates/grafana.yaml

@@ -61,7 +61,7 @@ spec:
               resources:
                 requests:
                   cpu: 20m
-                  memory: 150Mi
+                  memory: 120Mi
               env:
                 - name: AUTH_CLIENT_ID
                   valueFrom:

clusters/cl01tl/helm/harbor/Chart.yaml

@@ -4,14 +4,15 @@ version: 1.0.0
 description: Harbor
 keywords:
   - harbor
-  - image-registry
-home: https://docs.alexlebens.dev/applications/harbor/
+  - images
+  - cache
+  - kubernetes
+home: https://wiki.alexlebens.dev/s/7e132c13-afee-48ec-b3dd-efd656d240c9
 sources:
   - https://github.com/goharbor
-  - https://github.com/orgs/goharbor/packages
+  - https://github.com/cloudnative-pg/cloudnative-pg
   - https://github.com/goharbor/harbor-helm
   - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
-  - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/valkey
 maintainers:
   - name: alexlebens
 dependencies:

clusters/cl01tl/helm/harbor/templates/external-secret.yaml

@@ -14,49 +14,85 @@ spec:
   data:
     - secretKey: HARBOR_ADMIN_PASSWORD
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/config
+        metadataPolicy: None
         property: admin-password
     - secretKey: secretKey
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/config
+        metadataPolicy: None
         property: secretKey
     - secretKey: CSRF_KEY
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/core
+        metadataPolicy: None
         property: CSRF_KEY
     - secretKey: secret
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/core
+        metadataPolicy: None
         property: secret
     - secretKey: tls.crt
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/core
+        metadataPolicy: None
         property: tls.crt
     - secretKey: tls.key
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/core
+        metadataPolicy: None
         property: tls.key
     - secretKey: JOBSERVICE_SECRET
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/jobservice
+        metadataPolicy: None
         property: JOBSERVICE_SECRET
     - secretKey: REGISTRY_HTTP_SECRET
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/registry
+        metadataPolicy: None
         property: REGISTRY_HTTP_SECRET
     - secretKey: REGISTRY_REDIS_PASSWORD
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/registry
+        metadataPolicy: None
         property: REGISTRY_REDIS_PASSWORD
     - secretKey: REGISTRY_HTPASSWD
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/registry
+        metadataPolicy: None
         property: REGISTRY_HTPASSWD
     - secretKey: REGISTRY_CREDENTIAL_PASSWORD
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/registry
+        metadataPolicy: None
         property: REGISTRY_CREDENTIAL_PASSWORD
     - secretKey: REGISTRY_PASSWD
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/harbor/registry
+        metadataPolicy: None
         property: REGISTRY_CREDENTIAL_PASSWORD

clusters/cl01tl/helm/harbor/values.yaml

@@ -21,9 +21,13 @@ harbor:
         size: 100Gi
   existingSecretAdminPassword: harbor-secret
   existingSecretAdminPasswordKey: HARBOR_ADMIN_PASSWORD
+  internalTLS:
+    enabled: false
   ipFamily:
     ipv6:
       enabled: false
+    ipv4:
+      enabled: true
   updateStrategy:
     type: Recreate
   existingSecretSecretKey: harbor-secret
@@ -69,12 +73,12 @@ harbor:
     credentials:
       existingSecret: harbor-secret
     upload_purging:
+      enabled: true
       age: 72h
+      interval: 24h
+      dryrun: false
   trivy:
     enabled: true
-    image:
-      repository: ghcr.io/goharbor/trivy-adapter-photon
-      tag: v2.15.0@sha256:6fd6de9cfbbb04cb1d94722cfa01cf71b8994d3f9e7891d3b03a89a7536480ba
   database:
     type: external
     external:
@@ -105,9 +109,32 @@ postgres-18-cluster:
         destinationBucket: postgres-backups
         externalSecretCredentialPath: /garage/home-infra/postgres-backups
         isWALArchiver: true
+      # - name: garage-remote
+      #   index: 1
+      #   destinationBucket: postgres-backups
+      #   externalSecretCredentialPath: /garage/home-infra/postgres-backups
+      #   retentionPolicy: "90d"
+      #   data:
+      #     compression: bzip2
+      # - name: external
+      #   index: 1
+      #   endpointURL: https://nyc3.digitaloceanspaces.com
+      #   destinationBucket: postgres-backups-ce540ddf106d186bbddca68a
+      #   externalSecretCredentialPath: /garage/home-infra/postgres-backups
+      #   isWALArchiver: false
     scheduledBackups:
       - name: live-backup
         suspend: false
         immediate: true
         schedule: "0 35 14 * * *"
         backupName: garage-local
+      # - name: weekly-backup
+      #   suspend: true
+      #   immediate: true
+      #   schedule: "0 0 4 * * SAT"
+      #   backupName: garage-remote
+      # - name: daily-backup
+      #   suspend: true
+      #   immediate: true
+      #   schedule: "0 0 0 * * *"
+      #   backupName: external

clusters/cl01tl/helm/headlamp/Chart.yaml

@@ -5,7 +5,8 @@ description: Headlamp
 keywords:
   - headlamp
   - dashboard
-home: https://docs.alexlebens.dev/applications/headlamp/
+  - kubernetes
+home: https://wiki.alexlebens.dev/s/6cc43960-78df-459d-aab6-433844249243
 sources:
   - https://github.com/headlamp-k8s/headlamp
   - https://github.com/headlamp-k8s/headlamp/tree/main/charts/headlamp

clusters/cl01tl/helm/headlamp/templates/external-secret.yaml

@@ -14,25 +14,43 @@ spec:
   data:
     - secretKey: OIDC_CLIENT_ID
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /authentik/oidc/headlamp
+        metadataPolicy: None
         property: client
     - secretKey: OIDC_CLIENT_SECRET
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /authentik/oidc/headlamp
+        metadataPolicy: None
         property: secret
     - secretKey: OIDC_ISSUER_URL
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /authentik/oidc/headlamp
+        metadataPolicy: None
         property: issuer
     - secretKey: OIDC_SCOPES
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /authentik/oidc/headlamp
+        metadataPolicy: None
         property: scopes
     - secretKey: HEADLAMP_CONFIG_OIDC_VALIDATOR_IDP_ISSUER_URL
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /authentik/oidc/headlamp
+        metadataPolicy: None
         property: validator-issuer-url
     - secretKey: HEADLAMP_CONFIG_OIDC_VALIDATOR_CLIENT_ID
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /authentik/oidc/headlamp
+        metadataPolicy: None
         property: validator-client-id

clusters/cl01tl/helm/headlamp/templates/http-route.yaml

@@ -0,0 +1,28 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: headlamp
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: headlamp
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  parentRefs:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: traefik-gateway
+      namespace: traefik
+  hostnames:
+    - headlamp.alexlebens.net
+  rules:
+    - matches:
+      - path:
+          type: PathPrefix
+          value: /
+      backendRefs:
+        - group: ''
+          kind: Service
+          name: headlamp
+          port: 80
+          weight: 100

clusters/cl01tl/helm/headlamp/values.yaml

@@ -1,9 +1,5 @@
 headlamp:
   replicaCount: 2
-  image:
-    registry: ghcr.io
-    repository: headlamp-k8s/headlamp
-    tag: v0.41.0@sha256:89c6c65810bfde61796483c93c70d659104355593792bf55cab680d685da8eeb
   config:
     oidc:
       secret:
@@ -14,30 +10,10 @@ headlamp:
     watchPlugins: true
     # Bypasses: https://github.com/kubernetes-sigs/headlamp/issues/4883
     sessionTTL: null
-  httpRoute:
-    enabled: true
-    parentRefs:
-      - group: gateway.networking.k8s.io
-        kind: Gateway
-        name: traefik-gateway
-        namespace: traefik
-    hostnames:
-      - headlamp.alexlebens.net
-    rules:
-      - matches:
-        - path:
-            type: PathPrefix
-            value: /
-        backendRefs:
-          - group: ''
-            kind: Service
-            name: headlamp
-            port: 80
-            weight: 100
   resources:
     requests:
-      cpu: 1m
-      memory: 80Mi
+      cpu: 10m
+      memory: 128Mi
   pluginsManager:
     enabled: true
     securityContext:

clusters/cl01tl/helm/home-assistant/Chart.yaml

@@ -4,13 +4,14 @@ version: 1.0.0
 description: Home Assistant
 keywords:
   - home-assistant
-  - home-automation
-home: https://docs.alexlebens.dev/applications/home-assistant/
+  - home
+  - automation
+home: https://wiki.alexlebens.dev/s/5462c17e-cd39-4082-ad01-94545a2fa3ca
 sources:
+  - https://www.home-assistant.io/
   - https://github.com/home-assistant/core
   - https://github.com/home-assistant/core/pkgs/container/home-assistant
   - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
-  - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/volsync-target
 maintainers:
   - name: alexlebens
 dependencies:

clusters/cl01tl/helm/home-assistant/templates/external-secret.yaml

@@ -14,11 +14,17 @@ spec:
   data:
     - secretKey: PASSWORD
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/home-assistant/code-server/auth
+        metadataPolicy: None
         property: PASSWORD
     - secretKey: SUDO_PASSWORD
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/home-assistant/code-server/auth
+        metadataPolicy: None
         property: SUDO_PASSWORD
 
 ---
@@ -38,5 +44,8 @@ spec:
   data:
     - secretKey: bearer-token
       remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
         key: /cl01tl/home-assistant/auth
+        metadataPolicy: None
         property: bearer-token

clusters/cl01tl/helm/home-assistant/values.yaml

@@ -4,29 +4,28 @@ home-assistant:
       type: deployment
       replicas: 1
       strategy: Recreate
-      pod:
-        securityContext:
-          fsGroup: 1000
-          fsGroupChangePolicy: OnRootMismatch
+      revisionHistoryLimit: 3
       containers:
         main:
           image:
             repository: ghcr.io/home-assistant/home-assistant
-            tag: 2026.3.4@sha256:916682086154a7390114a9788782b8efb199852d4f7d47066722c2bc5d1829e6
+            tag: 2026.3.4
+            pullPolicy: IfNotPresent
           env:
             - name: TZ
-              value: America/Chicago
+              value: US/Central
           resources:
             requests:
-              cpu: 1m
-              memory: 400Mi
+              cpu: 50m
+              memory: 512Mi
         code-server:
           image:
             repository: ghcr.io/linuxserver/code-server
             tag: 4.112.0@sha256:4bb5b8ad22268001687c047f0f04933799fb03df1eb0e1e266ba15ed2d9f4e8b
+            pullPolicy: IfNotPresent
           env:
             - name: TZ
-              value: America/Chicago
+              value: US/Central
             - name: PUID
               value: 1000
             - name: PGID
@@ -36,6 +35,10 @@ home-assistant:
           envFrom:
             - secretRef:
                 name: home-assistant-code-server-password-secret
+          resources:
+            requests:
+              cpu: 10m
+              memory: 128Mi
   service:
     main:
       controller: main
@@ -79,8 +82,11 @@ home-assistant:
         - home-assistant.alexlebens.net
       rules:
         - backendRefs:
-            - name: home-assistant-main
+            - group: ''
+              kind: Service
+              name: home-assistant-main
               port: 80
+              weight: 100
           matches:
             - path:
                 type: PathPrefix
@@ -96,8 +102,11 @@ home-assistant:
         - home-assistant-code-server.alexlebens.net
       rules:
         - backendRefs:
-            - name: home-assistant-code-server
+            - group: ''
+              kind: Service
+              name: home-assistant-code-server
               port: 8443
+              weight: 100
           matches:
             - path:
                 type: PathPrefix

clusters/cl01tl/helm/homepage/Chart.yaml

@@ -19,4 +19,4 @@ dependencies:
     version: 4.6.2
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/homepage.png
 # renovate: datasource=github-releases depName=gethomepage/homepage
-appVersion: v1.12.1
+appVersion: v1.12.0

clusters/cl01tl/helm/homepage/values.yaml

@@ -16,7 +16,7 @@ homepage:
         main:
           image:
             repository: ghcr.io/gethomepage/homepage
-            tag: v1.12.1
+            tag: v1.12.0
             pullPolicy: IfNotPresent
           env:
             - name: HOMEPAGE_ALLOWED_HOSTS

clusters/cl01tl/helm/music-grabber/Chart.yaml

@@ -17,5 +17,4 @@ dependencies:
     alias: music-grabber
     repository: https://bjw-s-labs.github.io/helm-charts/
     version: 4.6.2
-# renovate: datasource=docker depName=g33kphr33k/musicgrabber
-appVersion: 2.5.3
+appVersion: 2.0.4

clusters/cl01tl/helm/music-grabber/values.yaml

@@ -9,7 +9,7 @@ music-grabber:
         main:
           image:
             repository: g33kphr33k/musicgrabber
-            tag: 2.5.3
+            tag: 2.5.2
             pullPolicy: IfNotPresent
           env:
             - name: MUSIC_DIR

clusters/cl01tl/helm/postiz/values.yaml

@@ -9,7 +9,7 @@ postiz:
         main:
           image:
             repository: ghcr.io/gitroomhq/postiz-app
-            tag: v2.21.4
+            tag: v2.21.2
             pullPolicy: IfNotPresent
           env:
             - name: MAIN_URL

clusters/cl01tl/helm/searxng/values.yaml

@@ -9,7 +9,7 @@ searxng:
         main:
           image:
             repository: searxng/searxng
-            tag: latest@sha256:4d7ed8b7035ecf827bd901ba6d32f5c32d8119bc09bb3cdafeb0ce58f1b951c1
+            tag: latest@sha256:c026ed4cb1a29b21878fed2c13f4c31fa811b8b03d931aa8764e8528177e2862
             pullPolicy: IfNotPresent
           env:
             - name: SEARXNG_BASE_URL
@@ -39,7 +39,7 @@ searxng:
         main:
           image:
             repository: searxng/searxng
-            tag: latest@sha256:4d7ed8b7035ecf827bd901ba6d32f5c32d8119bc09bb3cdafeb0ce58f1b951c1
+            tag: latest@sha256:c026ed4cb1a29b21878fed2c13f4c31fa811b8b03d931aa8764e8528177e2862
             pullPolicy: IfNotPresent
           env:
             - name: SEARXNG_BASE_URL

clusters/cl01tl/helm/site-documentation/values.yaml

@@ -11,7 +11,7 @@ site-documentation:
         main:
           image:
             repository: harbor.alexlebens.net/images/site-documentation
-            tag: 0.12.0
+            tag: 0.11.0
             pullPolicy: IfNotPresent
           resources:
             requests:

clusters/cl01tl/helm/tdarr/values.yaml

@@ -39,28 +39,9 @@ tdarr:
               cpu: 200m
               memory: 1Gi
     node:
-      type: statefulset
-      replicas: 3
+      type: daemonset
       revisionHistoryLimit: 3
-      statefulset:
-        volumeClaimTemplates:
-          - name: transcode-cache
-            accessMode: ReadWriteOnce
-            size: 20Gi
-            storageClass: local-path
-            globalMounts:
-              - path: /tcache
       pod:
-        affinity:
-          podAntiAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              - labelSelector:
-                  matchExpressions:
-                    - key: app.kubernetes.io/instance
-                      operator: In
-                      values:
-                        - tdarr
-                topologyKey: kubernetes.io/hostname
         nodeSelector:
           intel.feature.node.kubernetes.io/gpu: "true"
       containers:
@@ -163,6 +144,13 @@ tdarr:
           main:
             - path: /tcache
               readOnly: false
+    node-cache:
+      type: emptyDir
+      advancedMounts:
+        node:
+          main:
+            - path: /tcache
+              readOnly: false
     media:
       existingClaim: tdarr-nfs-storage
       advancedMounts:
@@ -178,7 +166,7 @@ tdarr-exporter:
   image:
     name: homeylab/tdarr-exporter
     # renovate: datasource=docker depName=homeylab/tdarr-exporter
-    tag: 1.4.3
+    tag: 1.4.2
   metrics:
     serviceMonitor:
       enabled: true

hosts/ps10rp/homepage/compose.yaml

@@ -32,7 +32,7 @@ services:
             - /var/run/docker.sock:/var/run/docker.sock:ro
 
     homepage:
-        image: ghcr.io/gethomepage/homepage:v1.12.1@sha256:9627769818fbfb14147d3e633e57cef9c27c0c5f07585f5a1d6c3d3425b3b33c
+        image: ghcr.io/gethomepage/homepage:v1.12.0@sha256:5bb66eac5d48f021fd60414add03aa123d1feb85770550ddb1d99a5b8851c6c2
         container_name: homepage
         labels:
             traefik.enable: true

renovate.json

@@ -3,40 +3,62 @@
   "extends": [
     "config:recommended",
     "mergeConfidence:all-badges",
-    ":rebaseStalePrs"
+    ":rebaseStalePrs",
+    "group:recommended",
+    "group:monorepos",
+    "group:kubernetesMonorepo"
   ],
   "timezone": "America/Chicago",
   "labels": [],
   "prHourlyLimit": 0,
   "prConcurrentLimit": 0,
   "pinDigests": true,
-  "minimumReleaseAgeBehaviour": "timestamp-optional",
   "baseBranchPatterns": [
     "main"
   ],
+  "regexManagers": [
+    {
+      "fileMatch": ["(^|/)values\\.yaml$", "(^|/)values-.*\\.yaml$"],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s+tag:\\s+(?<currentValue>.*)"
+      ],
+      "datasourceTemplate": "{{{datasource}}}",
+      "depNameTemplate": "{{{depName}}}"
+    }
+  ],
   "customManagers": [
     {
-      "description": "Renovate tag matcher for Helm chart appVersion",
+      "description": "Update appVersion in Chart.yaml",
       "customType": "regex",
       "managerFilePatterns": [
         "/(^|/)Chart\\.yaml$/"
       ],
       "matchStrings": [
-        "#\\s*renovate:\\s*datasource=(?<datasource>\\S+)\\s+depName=(?<depName>\\S+)(?:\\s+versioning=(?<versioning>\\S+))?\\s+appVersion:\\s*[\"']?(?<currentValue>[^\\s\"']+)[\"']?"
+        "#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s+appVersion:\\s*[\"']?(?<currentValue>[^\"'\\s]+)[\"']?"
       ],
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}"
     },
     {
-      "description": "Renovate tag matcher for Helm values and templates",
+      "description": "Update specific images in values",
+      "customType": "regex",
+      "managerFilePatterns": [
+        "(^|/)values\\.yaml$"
+      ],
+      "matchStrings": [
+        "#\\s*renovate:\\s*datasource=(?<datasource>[^\\s]+)\\s+depName=(?<depName>[^\\s]+)\\s*\\n\\s+tag:\\s*[\"']?(?<currentValue>[^\"'\\s]+)[\"']?"
+      ],
+      "depNameTemplate": "{{{depName}}}",
+      "datasourceTemplate": "{{{datasource}}}"
+    },
+    {
+      "description": "Update images in templates",
       "customType": "regex",
       "managerFilePatterns": [
-        "/(^|/)values\\.yaml$/",
         "/(^|/)templates/.*\\.yaml$/"
       ],
       "matchStrings": [
-        "#\\s*renovate:\\s*datasource=(?<datasource>\\S+)\\s+depName=(?<depName>\\S+)(?:\\s+versioning=(?<versioning>\\S+))?\\s+tag:\\s*[\"']?(?<currentValue>[^@\\s\"']+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?[\"']?"
-      ],
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}docker{{/if}}"
+        "# renovate: datasource=(?<datasource>[^\\s]+)\\s+depName=(?<depName>[^\\s]+)\\s+tag:\\s*[\"']?(?<currentValue>[^@\"'\\s\n]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?[\"']?"
+      ]
     },
     {
       "description": "Update Helm CLI version in GitHub Actions",
@@ -74,48 +96,43 @@
       "enabled": false
     },
     {
-      "description": "Label Helm updates",
+      "description": "Label by datasource",
       "matchDatasources": [
-        "helm"
+        "helm",
+        "docker",
+        "github-actions"
       ],
       "addLabels": [
-        "helm"
-      ]
-    },
-    {
-      "description": "Label Docker updates",
-      "matchDatasources": [
-        "docker"
-      ],
-      "addLabels": [
-        "docker"
+        "{{{datasource}}}"
       ]
     },
     {
       "description": "Versioning for LinuxServer images",
       "versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-ls(?<revision>\\d+)$",
       "matchPackageNames": [
-        "/^linuxserver//",
-        "/^ghcr\\.io/linuxserver//",
-        "/^lscr\\.io/linuxserver//"
+        "/^linuxserver\\//",
+        "/^ghcr\\.io/linuxserver\\//",
+        "/^lscr\\.io/linuxserver\\//"
       ]
     },
     {
-      "description": "Group packages together by stripping all registry/namespace prefixes",
-      "groupName": "{{#if packageName}}{{{replace '^.*/([^/]+)$' '$1' packageName}}}{{else}}{{{replace '^.*/([^/]+)$' '$1' depName}}}{{/if}}",
-      "groupSlug": "unified-{{{groupName}}}",
-      "matchPackageNames": [
-        "*"
-      ]
+      "description": "Group packages together when stripping registry",
+      "matchManagers": [
+        "custom.regex",
+        "helm-values",
+        "docker"
+      ],
+      "groupName": "{{#if packageName}}{{{replace 'ghcr.io/' '' (replace 'docker.io/' '' packageName)}}}{{else}}{{{replace 'ghcr.io/' '' (replace 'docker.io/' '' depName)}}}{{/if}}",
+      "groupSlug": "unified-{{{groupName}}}"
     },
     {
-      "description": "Group for specific apps, these have different package and repo names",
-      "groupName": "{{{replace '^.*(argo-cd|bazarr|cilium|code-server|dawarich|element-web|home-assistant|immich|komodo|postiz|rook-ceph|roundcube|rybbit|tdarr|traefik).*$' '$1' depName}}}",
-      "groupSlug": "unified-{{{groupName}}}",
+      "description": "Group for specific apps",
       "matchPackageNames": [
-        "/(^|/)(argo-cd|bazarr|cilium|code-server|dawarich|element-web|home-assistant|immich|komodo|postiz|rook-ceph|roundcube|rybbit|tdarr|traefik)/",
-        "/^rook(-ceph|/rook|/ceph)/"
-      ]
+        "/(^|/)(argo-cd|bazarr|cilium|code-server|dawarich|element-web|home-assistant|immich|komodo|rook-ceph|tdarr|traefik)/",
+        "/^rook(-ceph|\\/rook|\\/ceph)/"
+      ],
+      "groupName": "{{{replace '^.*(argo-cd|bazarr|cilium|code-server|dawarich|element-web|home-assistant|immich|komodo|rook-ceph|tdarr|traefik).*$' '$1' depName}}}",
+      "groupSlug": "unified-{{{groupName}}}"
     },
     {
       "description": "Automerge helm chart lock files",
@@ -126,7 +143,6 @@
         "enabled": true
       },
       "addLabels": [
-        "{{{datasource}}}",
         "automerge"
       ],
       "automerge": true,
@@ -147,11 +163,13 @@
       "matchUpdateTypes": [
         "digest"
       ],
+      "matchDatasources": [
+        "docker"
+      ],
       "matchPackageNames": [
         "searxng/searxng"
       ],
       "addLabels": [
-        "{{{datasource}}}",
         "automerge"
       ],
       "enabled": true,
@@ -163,30 +181,34 @@
         "patch",
         "pinDigest"
       ],
+      "matchDatasources": [
+        "helm",
+        "docker",
+        "github-actions"
+      ],
       "addLabels": [
-        "{{{datasource}}}",
         "automerge"
       ],
       "automerge": true,
-      "minimumReleaseAge": "3 days"
+      "minimumReleaseAge": "1 days"
     },
     {
       "description": "Automerge images, specific packages",
       "matchUpdateTypes": [
-        "minor",
         "patch",
-        "pinDigest"
+        "minor"
+      ],
+      "matchDatasources": [
+        "docker"
       ],
       "matchPackageNames": [
         "ghcr.io/renovatebot/renovate",
         "ghcr.io/prometheus-community/charts/kube-prometheus-stack"
       ],
       "addLabels": [
-        "{{{datasource}}}",
         "automerge"
       ],
-      "automerge": true,
-      "minimumReleaseAge": "3 days"
+      "automerge": true
     }
   ]
 }