diff --git a/alertmanager-matrix/Chart.yaml b/alertmanager-matrix/Chart.yaml
index 7218f48..4282b13 100644
--- a/alertmanager-matrix/Chart.yaml
+++ b/alertmanager-matrix/Chart.yaml
@@ -4,6 +4,10 @@ description: Service for managing and receiving Alertmanager alerts on Matrix
 type: application
 version: 0.1.4
 appVersion: "latest"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
+
 keywords:
   - matrix
   - alertmanager
diff --git a/alertmanager-matrix/values.yaml b/alertmanager-matrix/values.yaml
index be5129b..e8bfe23 100644
--- a/alertmanager-matrix/values.yaml
+++ b/alertmanager-matrix/values.yaml
@@ -29,29 +29,29 @@ bot:
     userID: "bot"
     token: "SECRET_TOKEN"
     rooms:
-     - "!not_existing:matrix.org"
-     - "!also_not_existing:matrix.org"
+      - "!not_existing:matrix.org"
+      - "!also_not_existing:matrix.org"
   alertmanager: "http://localhost:9093"
   showLabels: false
   messageType: "m.notice"
   icons:
-    alert:       "🔔️"
+    alert: "🔔️"
     information: "ℹ️"
-    info:        "ℹ️"
-    warning:     "⚠️"
-    critical:    "🚨"
-    error:       "🚨"
-    resolved:    "✅"
-    silenced:    "🔕"
+    info: "ℹ️"
+    warning: "⚠️"
+    critical: "🚨"
+    error: "🚨"
+    resolved: "✅"
+    silenced: "🔕"
   colors:
-    alert:       "black"
+    alert: "black"
     information: "blue"
-    info:        "blue"
-    warning:     "orange"
-    critical:    "red"
-    error:       "red"
-    resolved:    "green"
-    silenced:    "gray"
+    info: "blue"
+    warning: "orange"
+    critical: "red"
+    error: "red"
+    resolved: "green"
+    silenced: "gray"
   # get from: https://gitlab.com/silkeh/alertmanager_matrix/-/blob/master/pkg/bot/formatting.go
   template:
     text: >
diff --git a/alertmanager-ntfy/Chart.yaml b/alertmanager-ntfy/Chart.yaml
index 2fd4c51..6a7992b 100644
--- a/alertmanager-ntfy/Chart.yaml
+++ b/alertmanager-ntfy/Chart.yaml
@@ -3,5 +3,7 @@ name: alertmanager-ntfy
 description: Receiver for alertmanager to forward to ntfy.sh
 type: application
 version: 0.1.2
-
 appVersion: "0.3.0"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/authentik-application/Chart.yaml b/authentik-application/Chart.yaml
index 0314fb2..9ff3a96 100644
--- a/authentik-application/Chart.yaml
+++ b/authentik-application/Chart.yaml
@@ -1,6 +1,8 @@
 apiVersion: v2
 name: authentik-application
-type: application
-
-version: 0.4.0
 description: "A Chart to deploy a secret for the authentik blueprint-sidecar."
+type: application
+version: 0.4.0
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/authentik-application/ci/ct-values.yaml b/authentik-application/ci/ct-values.yaml
index da317d2..d558f32 100644
--- a/authentik-application/ci/ct-values.yaml
+++ b/authentik-application/ci/ct-values.yaml
@@ -1,4 +1,3 @@
-
 blueprint:
   groups:
     - slug: "app: grafana-admin"
diff --git a/authentik-application/values.yaml b/authentik-application/values.yaml
index a4b6fa6..52fc7f6 100644
--- a/authentik-application/values.yaml
+++ b/authentik-application/values.yaml
@@ -38,12 +38,12 @@ blueprint:
       skipPathRegex: ""
       cookieDomain: ""
       ingress:
-         # -- deploy ingress on application domain for e.g. logout (WIP)
-         enabled: false
-         # -- domain of application (where outpost should be deployed)
-         domain:
-         # -- service backend to authentik
-         backend: authentik 
+        # -- deploy ingress on application domain for e.g. logout (WIP)
+        enabled: false
+        # -- domain of application (where outpost should be deployed)
+        domain:
+        # -- service backend to authentik
+        backend: authentik
   application:
     # -- application name in menu
     name: ""
@@ -54,7 +54,7 @@ blueprint:
     # url to application
     launchURL: ""
     # -- open application in new tab
-    openInNewTab: false 
+    openInNewTab: false
     # -- icon of application (url)
     icon: ""
     # -- description of application
diff --git a/conduit/Chart.yaml b/conduit/Chart.yaml
index 9508774..c9355c1 100644
--- a/conduit/Chart.yaml
+++ b/conduit/Chart.yaml
@@ -1,8 +1,10 @@
 apiVersion: v2
 name: conduit
 description: Conduit is a simple, fast and reliable chat server powered by Matrix.
-
+icon: https://conduit.rs/conduit.svg
 type: application
-
 version: 0.2.1
 appVersion: "0.6.0"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/conduit/values.yaml b/conduit/values.yaml
index 8a03180..c5e8d6b 100644
--- a/conduit/values.yaml
+++ b/conduit/values.yaml
@@ -32,7 +32,8 @@ conduit:
   allowUnstableRoomVersions: true
   trustedServers:
     - "matrix.org"
-  maxRequestSize: "20000000" # in bytes, ~20 MB
+  # -- in bytes default 20 MB
+  maxRequestSize: "20000000"
   # maxConcurrentRequests: 100
   maxConcurrentRequests:
   # log: "warn,rocket=off,_=off,sled=off"
@@ -67,11 +68,11 @@ wellknown:
   # TO EDIT:
   server:
     "m.server": "your.server.name:443"
-  client:  
+  client:
     "m.homeserver":
-      "base_url": "https://your.server.name/" 
+      "base_url": "https://your.server.name/"
     "org.matrix.msc3575.proxy":
-      "url": "https://your.server.name/" 
+      "url": "https://your.server.name/"
 
 podLabels: {}
 podAnnotations: {}
@@ -132,27 +133,25 @@ tolerations: []
 
 affinity: {}
 
-## Enable persistence using Persistent Volume Claims
-## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
-##
+# Enable persistence using Persistent Volume Claims
+# ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
 persistence:
   enabled: true
   annotations: {}
-  ## Persistent Volume Storage Class
-  ## If defined, storageClassName: <storageClass>
-  ## If set to "-", storageClassName: "", which disables dynamic provisioning
-  ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-  ##   GKE, AWS & OpenStack)
-  ##
-  # storageClass: "-"
+  # --  Persistent Volume Storage Class
+  # If defined, storageClassName: <storageClass>
+  # If set to "-", storageClassName: "", which disables dynamic provisioning
+  # If undefined (the default) or set to null, no storageClassName spec is
+  #   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  #   GKE, AWS & OpenStack)
+  storageClass:
 
-  ## A manually managed Persistent Volume and Claim
-  ## Requires persistence.enabled: true
-  ## If defined, PVC must be created manually before volume will be bound
-  # existingClaim:
+  # -- A manually managed Persistent Volume and Claim
+  # Requires persistence.enabled: true
+  # If defined, PVC must be created manually before volume will be bound
+  existingClaim:
 
-  ## Do not create an PVC, direct use hostPath in Pod
-  # hostPath: 
+  # -- Do not create an PVC, direct use hostPath in Pod
+  hostPath:
   accessMode: ReadWriteOnce
   size: 1Gi
diff --git a/ct.yaml b/ct.yaml
new file mode 100644
index 0000000..f3f3954
--- /dev/null
+++ b/ct.yaml
@@ -0,0 +1,4 @@
+target-branch: main
+since: HEAD~2
+chart-dirs:
+  - .
diff --git a/forgejo-runner/Chart.yaml b/forgejo-runner/Chart.yaml
index 1feb7c6..09ac71f 100644
--- a/forgejo-runner/Chart.yaml
+++ b/forgejo-runner/Chart.yaml
@@ -3,5 +3,7 @@ name: forgejo-runner
 description: Deploy runner for an forgejo instance (default codeberg.org)
 type: application
 version: 0.1.4
-
 appVersion: "3.2.0"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/grampsweb/Chart.yaml b/grampsweb/Chart.yaml
index 48a56bd..f7c381b 100644
--- a/grampsweb/Chart.yaml
+++ b/grampsweb/Chart.yaml
@@ -1,8 +1,10 @@
 apiVersion: v2
 name: grampsweb
 description: A Helm chart for gramps web
-
+icon: https://raw.githubusercontent.com/gramps-project/Gramps.js/main/images/icon512.png
 type: application
 version: 0.1.1
-
 appVersion: "23.11.0"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/grampsweb/values.yaml b/grampsweb/values.yaml
index 8cc298b..0fc804a 100644
--- a/grampsweb/values.yaml
+++ b/grampsweb/values.yaml
@@ -53,7 +53,7 @@ persistence:
   existingClaim:
 
   # -- Do not create an PVC, direct use hostPath in Pod
-  hostPath: 
+  hostPath:
   accessMode: ReadWriteOnce
   size: 5Gi
 
diff --git a/headscale-ui/Chart.yaml b/headscale-ui/Chart.yaml
index 8dd31b4..b4cfa49 100644
--- a/headscale-ui/Chart.yaml
+++ b/headscale-ui/Chart.yaml
@@ -1,8 +1,10 @@
 apiVersion: v2
 name: headscale-ui
-description: A simple Headscale web UI for small-scale deployments. 
-
+description: A simple Headscale web UI for small-scale deployments.
+icon: https://raw.githubusercontent.com/gurucomputing/headscale-ui/master/static/favicon.png
 type: application
 version: 0.1.1
-
 appVersion: "2023.01.30-beta-1"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/headscale/Chart.yaml b/headscale/Chart.yaml
index 21c9920..d6d5e66 100644
--- a/headscale/Chart.yaml
+++ b/headscale/Chart.yaml
@@ -5,8 +5,12 @@ icon: https://raw.githubusercontent.com/juanfont/headscale/56a7b1e34952c3e0306a1
 type: application
 version: 0.2.2
 appVersion: "0.22.3"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
+
 keywords:
   - headscale
   - tailscale
   - wireguard
-  - vpn
\ No newline at end of file
+  - vpn
diff --git a/headscale/values.yaml b/headscale/values.yaml
index 51b8430..6208e1c 100644
--- a/headscale/values.yaml
+++ b/headscale/values.yaml
@@ -20,7 +20,7 @@ headscale:
     create: true
     # -- Use an existing secret
     existingSecret: ""
-  
+
   certmanager:
     enabled: true
     dnsNames:
@@ -34,7 +34,7 @@ headscale:
     metrics_listen_addr: ":9090"
     grpc_listen_addr: ":50443"
 
-    server_url: http://127.0.0.1:8080    
+    server_url: http://127.0.0.1:8080
 
     # SQLite config
     db_type: sqlite3
@@ -51,7 +51,7 @@ headscale:
     # db_user: foo
     # db_pass: bar
     private_key_path: "/etc/headscale/secrets/wireguard.key"
-    noise:    
+    noise:
       private_key_path: "/etc/headscale/secrets/noise.key"
     # # certs
     # use certmanager instatt of internal acme:
@@ -84,28 +84,26 @@ prometheus:
 
 ## Enable persistence using Persistent Volume Claims
 ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
-##
 persistence:
   # Upload (/var/lib/headscale)
   enabled: false
   annotations: {}
-  ## mobilizon data Persistent Volume Storage Class
-  ## If defined, storageClassName: <storageClass>
-  ## If set to "-", storageClassName: "", which disables dynamic provisioning
-  ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-  ##   GKE, AWS & OpenStack)
-  ##
-  # storageClass: "-"
+  # -- data Persistent Volume Storage Class
+  # If defined, storageClassName: <storageClass>
+  # If set to "-", storageClassName: "", which disables dynamic provisioning
+  # If undefined (the default) or set to null, no storageClassName spec is
+  #   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  #   GKE, AWS & OpenStack)
+  storageClass:
 
-  ## A manually managed Persistent Volume and Claim
-  ## Requires persistence.enabled: true
-  ## If defined, PVC must be created manually before volume will be bound
-  # existingClaim:
+  # --  A manually managed Persistent Volume and Claim
+  # Requires persistence.enabled: true
+  # If defined, PVC must be created manually before volume will be bound
+  existingClaim:
 
-  ## Create a PV on Node with given hostPath
-  ## storageClass has to be manual
-  # hostPath: 
+  # -- Create a PV on Node with given hostPath
+  # storageClass has to be manual
+  hostPath:
   accessMode: ReadWriteOnce
   size: 1Gi
 
@@ -161,7 +159,7 @@ ingress:
   annotations: {}
     # for usage with certmanager (pod certs) and nginx
     # nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-    # 
+    #
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
diff --git a/hydrogen-web/Chart.yaml b/hydrogen-web/Chart.yaml
index e0742b6..872600e 100644
--- a/hydrogen-web/Chart.yaml
+++ b/hydrogen-web/Chart.yaml
@@ -1,8 +1,10 @@
 apiVersion: v2
 name: hydrogen-web
 description: A Helm Chart to install hydrogen-web (a nextgen Matrix Webclient)
-
+icon: https://raw.githubusercontent.com/element-hq/hydrogen-web/master/src/platform/web/assets/icon.svg
 type: application
-
 version: 0.1.4
 appVersion: "0.4.1"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/jellyfin/Chart.yaml b/jellyfin/Chart.yaml
index 91ffd9f..c22c529 100644
--- a/jellyfin/Chart.yaml
+++ b/jellyfin/Chart.yaml
@@ -1,7 +1,10 @@
 apiVersion: v2
 name: jellyfin
 description: The Free Software Media System
+icon: https://raw.githubusercontent.com/jellyfin/jellyfin-ux/master/branding/SVG/icon-transparent.svg
 type: application
-
 version: 0.1.4
 appVersion: "10.8.13"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/miniserve/Chart.yaml b/miniserve/Chart.yaml
index 6697060..be022e2 100644
--- a/miniserve/Chart.yaml
+++ b/miniserve/Chart.yaml
@@ -1,11 +1,10 @@
 apiVersion: v2
 name: miniserve
 description: A Helm chart for Kubernetes
+icon: https://raw.githubusercontent.com/svenstaro/miniserve/master/data/logo.svg
 type: application
 version: 0.3.3
-icon: https://raw.githubusercontent.com/svenstaro/miniserve/master/data/logo.svg
+appVersion: "0.25.0"
 maintainers:
   - name: WrenIX
     url: https://wrenix.eu
-
-appVersion: "0.25.0"
diff --git a/monitoring/Chart.yaml b/monitoring/Chart.yaml
index cdf6940..3ca43c2 100644
--- a/monitoring/Chart.yaml
+++ b/monitoring/Chart.yaml
@@ -1,6 +1,9 @@
 apiVersion: v2
 name: monitoring
 description: Deploy helper for probes and scrapeconfig of prometheus-operator
+icon: https://prometheus.io/assets/favicons/android-chrome-192x192.png
 type: application
-
 version: 0.1.0
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/monitoring/values.yaml b/monitoring/values.yaml
index 29698ad..0c8893f 100644
--- a/monitoring/values.yaml
+++ b/monitoring/values.yaml
@@ -9,8 +9,8 @@ prometheus:
       prometheus: "default"
 
 scrapes:
-  - # -- name of scrape
-    name: nodes
+    # -- name of scrape
+  - name: nodes
     # -- groups with targets
     groups:
       de:
@@ -20,8 +20,8 @@ scrapes:
       ie:
         - "dub.ie.local:9100"
         - "ork.ie.local:9100"
-  - # -- name of scrape
-    name: minio
+    # -- name of scrape
+  - name: minio
     # -- metric path on scrape
     metricsPath: /minio/v2/metrics/node
     # -- schema on scrape
@@ -43,16 +43,16 @@ scrapes:
 
 # -- prober for each the following probes are created (multiside probes)
 prober:
-  - # -- name of prober
-    name: "local"
+    # -- name of prober
+  - name: "local"
     # -- spec of prober (like url, path, scheme ...)
     spec:
       url: "prometheus-blackbox-exporter:9115"
       path: "/probe"
 
 probes:
-  - # -- probe module (suffix with _ipv4 and ipv6 if enabled)
-    module: http_2xx
+    # -- probe module (suffix with _ipv4 and ipv6 if enabled)
+  - module: http_2xx
     # -- name of probe
     name: http
     # -- setup one for ipv4 (see module and his suffix)
@@ -67,8 +67,8 @@ probes:
         - framapiaf.org
         - framatube.org
 
-  - # -- probe module (suffix with _ipv4 and ipv6 if enabled)
-    module: http_2xx
+    # -- probe module (suffix with _ipv4 and ipv6 if enabled)
+  - module: http_2xx
     # -- name of probe
     name: http-ipv4
     # -- setup one for ipv4 (see module and his suffix)
@@ -80,4 +80,4 @@ probes:
       digitalcourage:
         - digitalcourage.de
         - nuudel.digitalcourage.de
-        - digitalcourage.social
\ No newline at end of file
+        - digitalcourage.social
diff --git a/ntfy/Chart.yaml b/ntfy/Chart.yaml
index e55625e..7ae42b3 100644
--- a/ntfy/Chart.yaml
+++ b/ntfy/Chart.yaml
@@ -1,7 +1,10 @@
 apiVersion: v2
 name: ntfy
 description: A Helm chart for Kubernetes
+icon: https://github.com/binwiederhier/ntfy/raw/main/web/public/static/images/pwa-512x512.png
 type: application
-
 version: 0.1.6
 appVersion: "2.8.0"
+maintainers:
+  - name: WrenIX
+    url: https://wrenix.eu
diff --git a/ntfy/templates/NOTES.txt b/ntfy/templates/NOTES.txt
index 33672f5..9c54598 100644
--- a/ntfy/templates/NOTES.txt
+++ b/ntfy/templates/NOTES.txt
@@ -5,16 +5,16 @@
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
   {{- end }}
 {{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
+{{- else if contains "NodePort" .Values.service.http.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "ntfy.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
+{{- else if contains "LoadBalancer" .Values.service.http.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
            You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "ntfy.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "ntfy.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
+  echo http://$SERVICE_IP:{{ .Values.service.http.port }}
+{{- else if contains "ClusterIP" .Values.service.http.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "ntfy.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
diff --git a/ntfy/values.yaml b/ntfy/values.yaml
index 469598e..67badd8 100644
--- a/ntfy/values.yaml
+++ b/ntfy/values.yaml
@@ -63,7 +63,7 @@ ntfy:
     server:
       domain: null
       addrPrefix: null
-  globalTopicLimit: 15000    
+  globalTopicLimit: 15000
   visitor:
     subscriptionLimit: 30
     attachment:
@@ -93,23 +93,22 @@ persistence:
   # Upload (/var/www/html)
   enabled: false
   annotations: {}
-  ## mobilizon data Persistent Volume Storage Class
-  ## If defined, storageClassName: <storageClass>
-  ## If set to "-", storageClassName: "", which disables dynamic provisioning
-  ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-  ##   GKE, AWS & OpenStack)
-  ##
-  # storageClass: "-"
+  # -- data Persistent Volume Storage Class
+  # If defined, storageClassName: <storageClass>
+  # If set to "-", storageClassName: "", which disables dynamic provisioning
+  # If undefined (the default) or set to null, no storageClassName spec is
+  #   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  #   GKE, AWS & OpenStack)
+  storageClass:
 
-  ## A manually managed Persistent Volume and Claim
-  ## Requires persistence.enabled: true
-  ## If defined, PVC must be created manually before volume will be bound
-  # existingClaim:
+  # -- A manually managed Persistent Volume and Claim
+  # Requires persistence.enabled: true
+  # If defined, PVC must be created manually before volume will be bound
+  existingClaim:
 
-  ## Create a PV on Node with given hostPath
-  ## storageClass has to be manual
-  # hostPath: 
+  # -- Create a PV on Node with given hostPath
+  # storageClass has to be manual
+  hostPath:
   accessMode: ReadWriteOnce
   size: 1Gi
 
diff --git a/postgresql/Chart.yaml b/postgresql/Chart.yaml
index 3025da1..83dcc22 100644
--- a/postgresql/Chart.yaml
+++ b/postgresql/Chart.yaml
@@ -2,15 +2,14 @@
 apiVersion: "v2"
 name: "postgresql"
 description: "A Helm chart for running PostgreSQL (Postgres) database"
+icon: https://wiki.postgresql.org/images/a/a4/PostgreSQL_logo.3colors.svg
 type: "application"
 version: "0.1.3"
 appVersion: "16.1-alpine3.18"
-icon: https://wiki.postgresql.org/images/a/a4/PostgreSQL_logo.3colors.svg
 maintainers:
   - name: WrenIX
     url: https://wrenix.eu
 
-
 keywords:
   - "postgresql"
   - "postgres"
diff --git a/publish.sh b/publish.sh
index 517bc88..80e475b 100755
--- a/publish.sh
+++ b/publish.sh
@@ -21,6 +21,7 @@ for p in * ; do
     [ $p == "jellyfin" ] || \
     [ $p == "monitoring" ] || \
     [ $p == "ntfy" ] || \
+    [ $p == "postgresql" ] || \
     [ ! -d $p ] || \
     [ ! -f $p/Chart.yaml ] \
     ; then