diff --git a/charts/incubator/kometa/.helmignore b/charts/incubator/kometa/.helmignore
index 77ca5567b26..feb7464da6f 100644
--- a/charts/incubator/kometa/.helmignore
+++ b/charts/incubator/kometa/.helmignore
@@ -28,3 +28,5 @@ OWNERS
 /docs
 # icon
 icon.png
+icon.webp
+icon-small.webp
diff --git a/charts/incubator/kometa/Chart.yaml b/charts/incubator/kometa/Chart.yaml
index 1ab452adc96..69ed5db0665 100644
--- a/charts/incubator/kometa/Chart.yaml
+++ b/charts/incubator/kometa/Chart.yaml
@@ -19,7 +19,7 @@ dependencies:
 deprecated: false
 description: Python script to update metadata and automatically build collections.
 home: https://truecharts.org/charts/incubator/kometa
-icon: https://github.com/truecharts/charts/tree/master/charts/incubator/kometa/icon.webp
+icon: https://truecharts.org/img/hotlink-ok/chart-icons/kometa.webp
 keywords:
   - kometa
 kubeVersion: ">=1.24.0-0"
diff --git a/charts/incubator/kometa/README.md b/charts/incubator/kometa/README.md
index 16e941597f7..5ff62d00b95 100644
--- a/charts/incubator/kometa/README.md
+++ b/charts/incubator/kometa/README.md
@@ -7,7 +7,7 @@ title: README
 TrueCharts can be installed as both _normal_ Helm Charts or as TrueNAS SCALE Apps.
 Both solutions are fully supported, but we heavily advice the use of normal Helm Charts where possible
 
-For more information about this Chart, please check the docs on the TrueCharts [website](https://truecharts.org/charts/stable/plex-meta-manager)
+For more information about this Chart, please check the docs on the TrueCharts [website](https://truecharts.org/charts/incubator/kometa)
 
 **This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)**
 
@@ -21,6 +21,7 @@ To install TrueCharts Helm charts using Helm, you can use our OCI Repository.
 
 For more information on how to install TrueCharts Helm charts, checkout the instructions on the website: https://truecharts.org/helm/
 
+
 ### TrueNAS SCALE Apps
 
 For more information on how to use TrueCharts as TrueNAS SCALE Apps, please checkout the [quick-start guides for TrueNAS SCALE](https://truecharts.org/scale/guides/scale-intro).
@@ -40,6 +41,7 @@ https://truecharts.org/charts/incubator/kometa
 
 ## Support
 
+
 - See the [Website](https://truecharts.org)
 - Check our [Discord](https://discord.gg/tVsPTHWTtr)
 - Open a [issue](https://github.com/truecharts/charts/issues/new/choose)
diff --git a/charts/premium/blocky/Chart.yaml b/charts/premium/blocky/Chart.yaml
index 0058cc488bb..1390d4867e3 100644
--- a/charts/premium/blocky/Chart.yaml
+++ b/charts/premium/blocky/Chart.yaml
@@ -41,7 +41,7 @@ sources:
   - https://0xerr0r.github.io/blocky/
   - https://github.com/0xERR0R/blocky
   - https://github.com/truecharts/charts/tree/master/charts/premium/blocky
-  - https://quay.io/oriedge/k8s_gateway
   - https://hub.docker.com/r/spx01/blocky
+  - https://quay.io/oriedge/k8s_gateway
 type: application
 version: 15.0.3
diff --git a/charts/premium/grafana/Chart.yaml b/charts/premium/grafana/Chart.yaml
index 957e69a627e..a952ec5c25e 100644
--- a/charts/premium/grafana/Chart.yaml
+++ b/charts/premium/grafana/Chart.yaml
@@ -35,7 +35,7 @@ sources:
   - https://grafana.com/
   - https://github.com/bitnami/bitnami-docker-grafana
   - https://github.com/truecharts/charts/tree/master/charts/premium/grafana
-  - https://hub.docker.com/r/grafana/grafana
   - https://quay.io/kiwigrid/k8s-sidecar
+  - https://hub.docker.com/r/grafana/grafana
 type: application
 version: 15.0.3
diff --git a/charts/premium/nextcloud/Chart.yaml b/charts/premium/nextcloud/Chart.yaml
index 86090af8024..d36325cd6c4 100644
--- a/charts/premium/nextcloud/Chart.yaml
+++ b/charts/premium/nextcloud/Chart.yaml
@@ -43,10 +43,10 @@ sources:
   - https://github.com/nextcloud/docker
   - https://github.com/nextcloud/helm
   - https://github.com/truecharts/charts/tree/master/charts/premium/nextcloud
-  - https://github.com/truecharts/containers/tree/master/apps/nextcloud-push-notify
-  - https://github.com/truecharts/containers/tree/master/apps/nextcloud-fpm
   - https://hub.docker.com/r/collabora/code
+  - https://github.com/truecharts/containers/tree/master/apps/nextcloud-fpm
   - https://hub.docker.com/r/nginxinc/nginx-unprivileged
+  - https://github.com/truecharts/containers/tree/master/apps/nextcloud-push-notify
   - https://github.com/truecharts/containers/tree/master/apps/nextcloud-imaginary
   - https://hub.docker.com/r/clamav/clamav
 type: application
diff --git a/charts/premium/prometheus/Chart.yaml b/charts/premium/prometheus/Chart.yaml
index d3ea3f8cc11..6ad68360223 100644
--- a/charts/premium/prometheus/Chart.yaml
+++ b/charts/premium/prometheus/Chart.yaml
@@ -40,7 +40,7 @@ sources:
   - https://github.com/prometheus-operator/kube-prometheus
   - https://github.com/truecharts/charts/tree/master/charts/premium/prometheus
   - https://hub.docker.com/r/bitnami/prometheus
-  - https://hub.docker.com/r/bitnami/alertmanager
   - https://quay.io/thanos/thanos
+  - https://hub.docker.com/r/bitnami/alertmanager
 type: application
 version: 18.0.4
diff --git a/charts/stable/authentik/Chart.yaml b/charts/stable/authentik/Chart.yaml
index fab0e918c18..64f0029edb6 100644
--- a/charts/stable/authentik/Chart.yaml
+++ b/charts/stable/authentik/Chart.yaml
@@ -40,9 +40,9 @@ sources:
   - https://github.com/goauthentik/authentik
   - https://github.com/truecharts/charts/tree/master/charts/stable/authentik
   - https://ghcr.io/goauthentik/server
+  - https://ghcr.io/maxmind/geoipupdate
   - https://ghcr.io/goauthentik/ldap
   - https://ghcr.io/goauthentik/radius
   - https://ghcr.io/goauthentik/proxy
-  - https://ghcr.io/maxmind/geoipupdate
 type: application
 version: 26.0.4
diff --git a/charts/stable/humhub/Chart.yaml b/charts/stable/humhub/Chart.yaml
index 7cc2887363c..0c8121936cf 100644
--- a/charts/stable/humhub/Chart.yaml
+++ b/charts/stable/humhub/Chart.yaml
@@ -45,7 +45,7 @@ maintainers:
 name: humhub
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/humhub
-  - https://ghcr.io/mriedmann/humhub-nginx
   - https://ghcr.io/mriedmann/humhub-phponly
+  - https://ghcr.io/mriedmann/humhub-nginx
 type: application
 version: 8.0.3
diff --git a/charts/stable/jellyfin/Chart.yaml b/charts/stable/jellyfin/Chart.yaml
index 165737e60a4..44c8b4a405f 100644
--- a/charts/stable/jellyfin/Chart.yaml
+++ b/charts/stable/jellyfin/Chart.yaml
@@ -33,7 +33,7 @@ name: jellyfin
 sources:
   - https://github.com/jellyfin/jellyfin
   - https://github.com/truecharts/charts/tree/master/charts/stable/jellyfin
-  - https://hub.docker.com/r/alpine/socat
   - https://hub.docker.com/r/jellyfin/jellyfin
+  - https://hub.docker.com/r/alpine/socat
 type: application
 version: 19.0.3
diff --git a/charts/stable/jupyter/Chart.yaml b/charts/stable/jupyter/Chart.yaml
index 3ff38151558..204fd37cc81 100644
--- a/charts/stable/jupyter/Chart.yaml
+++ b/charts/stable/jupyter/Chart.yaml
@@ -33,13 +33,13 @@ name: jupyter
 sources:
   - https://github.com/jupyter/docker-stacks
   - https://github.com/truecharts/charts/tree/master/charts/stable/jupyter
-  - https://hub.docker.com/r/jupyter/tensorflow-notebook
-  - https://hub.docker.com/r/jupyter/pyspark-notebook
+  - https://hub.docker.com/r/jupyter/r-notebook
+  - https://hub.docker.com/r/jupyter/base-notebook
   - https://hub.docker.com/r/jupyter/minimal-notebook
+  - https://hub.docker.com/r/jupyter/scipy-notebook
   - https://hub.docker.com/r/jupyter/all-spark-notebook
   - https://hub.docker.com/r/jupyter/datascience-notebook
-  - https://hub.docker.com/r/jupyter/base-notebook
-  - https://hub.docker.com/r/jupyter/r-notebook
-  - https://hub.docker.com/r/jupyter/scipy-notebook
+  - https://hub.docker.com/r/jupyter/tensorflow-notebook
+  - https://hub.docker.com/r/jupyter/pyspark-notebook
 type: application
 version: 9.0.4
diff --git a/charts/stable/kitchenowl/Chart.yaml b/charts/stable/kitchenowl/Chart.yaml
index d0a734c1288..52acd16708c 100644
--- a/charts/stable/kitchenowl/Chart.yaml
+++ b/charts/stable/kitchenowl/Chart.yaml
@@ -33,7 +33,7 @@ name: kitchenowl
 sources:
   - https://tombursch.github.io/kitchenowl
   - https://github.com/truecharts/charts/tree/master/charts/stable/kitchenowl
-  - https://hub.docker.com/r/tombursch/kitchenowl-web
   - https://hub.docker.com/r/tombursch/kitchenowl
+  - https://hub.docker.com/r/tombursch/kitchenowl-web
 type: application
 version: 10.0.4
diff --git a/charts/stable/lancache-monolithic/Chart.yaml b/charts/stable/lancache-monolithic/Chart.yaml
index b064917496d..2819a6659d9 100644
--- a/charts/stable/lancache-monolithic/Chart.yaml
+++ b/charts/stable/lancache-monolithic/Chart.yaml
@@ -32,7 +32,7 @@ name: lancache-monolithic
 sources:
   - https://github.com/lancachenet/monolithic
   - https://github.com/truecharts/charts/tree/master/charts/stable/lancache-monolithic
-  - https://hub.docker.com/r/ich777/lancache-prefill
   - https://hub.docker.com/r/lancachenet/monolithic
+  - https://hub.docker.com/r/ich777/lancache-prefill
 type: application
 version: 9.0.4
diff --git a/charts/stable/neko/Chart.yaml b/charts/stable/neko/Chart.yaml
index ff5a94366b8..b19291c7e83 100644
--- a/charts/stable/neko/Chart.yaml
+++ b/charts/stable/neko/Chart.yaml
@@ -33,14 +33,14 @@ sources:
   - https://github.com/m1k1o/neko
   - https://github.com/truecharts/charts/tree/master/charts/stable/neko
   - https://ghcr.io/m1k1o/neko/vivaldi
-  - https://ghcr.io/m1k1o/neko/xfce
-  - https://ghcr.io/m1k1o/neko/google-chrome
   - https://ghcr.io/m1k1o/neko/microsoft-edge
-  - https://ghcr.io/m1k1o/neko/brave
   - https://ghcr.io/m1k1o/neko/tor-browser
   - https://ghcr.io/m1k1o/neko/firefox
+  - https://ghcr.io/m1k1o/neko/brave
   - https://ghcr.io/m1k1o/neko/vlc
-  - https://ghcr.io/m1k1o/neko/chromium
   - https://ghcr.io/m1k1o/neko/remmina
+  - https://ghcr.io/m1k1o/neko/xfce
+  - https://ghcr.io/m1k1o/neko/google-chrome
+  - https://ghcr.io/m1k1o/neko/chromium
 type: application
 version: 7.0.3
diff --git a/charts/stable/portainer/Chart.yaml b/charts/stable/portainer/Chart.yaml
index 6ec81a8964b..c7781f37d50 100644
--- a/charts/stable/portainer/Chart.yaml
+++ b/charts/stable/portainer/Chart.yaml
@@ -32,7 +32,7 @@ sources:
   - https://docs.portainer.io/start/install-ce/server
   - https://docs.portainer.io/start/install/server
   - https://github.com/truecharts/charts/tree/master/charts/stable/portainer
-  - https://hub.docker.com/r/portainer/portainer-ce
   - https://hub.docker.com/r/portainer/portainer-ee
+  - https://hub.docker.com/r/portainer/portainer-ce
 type: application
 version: 9.0.4
diff --git a/charts/stable/prowlarr/Chart.yaml b/charts/stable/prowlarr/Chart.yaml
index c52cd7249d2..75673de17d4 100644
--- a/charts/stable/prowlarr/Chart.yaml
+++ b/charts/stable/prowlarr/Chart.yaml
@@ -34,7 +34,7 @@ sources:
   - https://github.com/Prowlarr/Prowlarr
   - https://github.com/k8s-at-home/container-images
   - https://github.com/truecharts/charts/tree/master/charts/stable/prowlarr
-  - https://ghcr.io/onedr0p/exportarr
   - https://ghcr.io/onedr0p/prowlarr-develop
+  - https://ghcr.io/onedr0p/exportarr
 type: application
 version: 17.0.4
diff --git a/charts/stable/readarr/Chart.yaml b/charts/stable/readarr/Chart.yaml
index a1981536f82..62ec675649a 100644
--- a/charts/stable/readarr/Chart.yaml
+++ b/charts/stable/readarr/Chart.yaml
@@ -36,7 +36,7 @@ sources:
   - https://readarr.com
   - https://github.com/Readarr/Readarr
   - https://github.com/truecharts/charts/tree/master/charts/stable/readarr
-  - https://ghcr.io/onedr0p/readarr-develop
   - https://ghcr.io/onedr0p/exportarr
+  - https://ghcr.io/onedr0p/readarr-develop
 type: application
 version: 22.0.3
diff --git a/charts/stable/rsshub/Chart.yaml b/charts/stable/rsshub/Chart.yaml
index 4e9e5c90191..f90f7a7a663 100644
--- a/charts/stable/rsshub/Chart.yaml
+++ b/charts/stable/rsshub/Chart.yaml
@@ -40,7 +40,7 @@ sources:
   - https://docs.rsshub.app/en/install/
   - https://github.com/DIYgod/RSSHub
   - https://github.com/truecharts/charts/tree/master/charts/stable/rsshub
-  - https://hub.docker.com/r/diygod/rsshub
   - https://hub.docker.com/r/browserless/chrome
+  - https://hub.docker.com/r/diygod/rsshub
 type: application
 version: 13.0.3
diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml
index 6c52d12f40f..680b5ba5cfa 100644
--- a/charts/stable/sonarr/Chart.yaml
+++ b/charts/stable/sonarr/Chart.yaml
@@ -33,7 +33,7 @@ name: sonarr
 sources:
   - https://github.com/Sonarr/Sonarr
   - https://github.com/truecharts/charts/tree/master/charts/stable/sonarr
-  - https://ghcr.io/onedr0p/exportarr
   - https://ghcr.io/onedr0p/sonarr
+  - https://ghcr.io/onedr0p/exportarr
 type: application
 version: 22.0.3
diff --git a/charts/stable/tt-rss/Chart.yaml b/charts/stable/tt-rss/Chart.yaml
index ae893d22c18..ef671981773 100644
--- a/charts/stable/tt-rss/Chart.yaml
+++ b/charts/stable/tt-rss/Chart.yaml
@@ -32,7 +32,7 @@ name: tt-rss
 sources:
   - https://git.tt-rss.org/fox/tt-rss
   - https://github.com/truecharts/charts/tree/master/charts/stable/tt-rss
-  - https://hub.docker.com/r/cthulhoo/ttrss-fpm-pgsql-static
   - https://hub.docker.com/r/cthulhoo/ttrss-web-nginx
+  - https://hub.docker.com/r/cthulhoo/ttrss-fpm-pgsql-static
 type: application
 version: 17.0.3
diff --git a/charts/stable/vikunja/Chart.yaml b/charts/stable/vikunja/Chart.yaml
index 8eda4925b15..72a0e8db428 100644
--- a/charts/stable/vikunja/Chart.yaml
+++ b/charts/stable/vikunja/Chart.yaml
@@ -38,8 +38,8 @@ name: vikunja
 sources:
   - https://vikunja.io/docs
   - https://github.com/truecharts/charts/tree/master/charts/stable/vikunja
-  - https://hub.docker.com/r/vikunja/api
-  - https://hub.docker.com/r/vikunja/frontend
   - https://hub.docker.com/_/nginx
+  - https://hub.docker.com/r/vikunja/frontend
+  - https://hub.docker.com/r/vikunja/api
 type: application
 version: 14.0.3
diff --git a/charts/system/openebs/questions.yaml b/charts/system/openebs/questions.yaml
index 087ce996c52..a948fae0c61 100644
--- a/charts/system/openebs/questions.yaml
+++ b/charts/system/openebs/questions.yaml
@@ -185,4 +185,4 @@ questions:
                     - value: Retain
                       description: Retain
                     - value: Delete
-                      description: Delete
\ No newline at end of file
+                      description: Delete
diff --git a/charts/system/openebs/values.yaml b/charts/system/openebs/values.yaml
index 0dca5bc03c7..8335269496d 100644
--- a/charts/system/openebs/values.yaml
+++ b/charts/system/openebs/values.yaml
@@ -195,4 +195,4 @@ volumeSnapshotClass:
     enabled: false
     isDefault: false
     driver: zfs.csi.openebs.io
-    deletionPolicy: Delete
\ No newline at end of file
+    deletionPolicy: Delete
diff --git a/charts/system/snapshot-controller/Chart.yaml b/charts/system/snapshot-controller/Chart.yaml
index 8b3e9f37c6a..c61a8af856e 100644
--- a/charts/system/snapshot-controller/Chart.yaml
+++ b/charts/system/snapshot-controller/Chart.yaml
@@ -7,7 +7,7 @@ annotations:
   truecharts.org/min_helm_version: "3.11"
   truecharts.org/train: system
 apiVersion: v2
-appVersion: latest
+appVersion: 7.0.1
 dependencies:
   - name: common
     version: 22.0.3
@@ -37,8 +37,7 @@ name: snapshot-controller
 sources:
   - https://github.com/snapshot-controller/snapshot-controller
   - https://github.com/snapshot-controller/snapshot-controller-helm-chart
-  - https://github.com/truecharts/charts/tree/master/charts/system/snapshot-controller
-  - https://github.com/truecharts/containers/tree/master/apps/scratch
   - https://github.com/kubernetes-csi/external-snapshotter/
+  - https://github.com/truecharts/charts/tree/master/charts/system/snapshot-controller
 type: application
 version: 1.0.0
diff --git a/charts/system/snapshot-controller/README.md b/charts/system/snapshot-controller/README.md
index 51cbecd8a1b..c9a93cdb85a 100644
--- a/charts/system/snapshot-controller/README.md
+++ b/charts/system/snapshot-controller/README.md
@@ -7,7 +7,7 @@ title: README
 TrueCharts can be installed as both _normal_ Helm Charts or as TrueNAS SCALE Apps.
 Both solutions are fully supported, but we heavily advice the use of normal Helm Charts where possible
 
-For more information about this Chart, please check the docs on the TrueCharts [website](https://truecharts.org/charts/system/volumesnapshots)
+For more information about this Chart, please check the docs on the TrueCharts [website](https://truecharts.org/charts/system/snapshot-controller)
 
 **This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)**
 
@@ -37,7 +37,7 @@ For the complete overview of all available options, please checkout the document
 
 All our charts have dedicated documentation pages.
 The documentation for this chart can be found here:
-https://truecharts.org/charts/system/volumesnapshots
+https://truecharts.org/charts/system/snapshot-controller
 
 ## Support
 
diff --git a/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml b/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml
index 9f06a7dd204..77b61fce5be 100644
--- a/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml
+++ b/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml
@@ -81,4 +81,4 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
\ No newline at end of file
+    subresources: {}
diff --git a/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml b/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml
index 2e063f8d679..c150705a0d4 100644
--- a/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml
+++ b/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml
@@ -312,4 +312,4 @@ spec:
     served: true
     storage: true
     subresources:
-      status: {}
\ No newline at end of file
+      status: {}
diff --git a/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml b/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml
index d0d4d790721..b8bf6366ec7 100644
--- a/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml
+++ b/charts/system/snapshot-controller/templates/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml
@@ -263,4 +263,4 @@ spec:
     served: true
     storage: true
     subresources:
-      status: {}
\ No newline at end of file
+      status: {}
diff --git a/charts/system/snapshot-controller/values.yaml b/charts/system/snapshot-controller/values.yaml
index c094e8cecc5..b770542b1e9 100644
--- a/charts/system/snapshot-controller/values.yaml
+++ b/charts/system/snapshot-controller/values.yaml
@@ -21,19 +21,19 @@ service:
         enabled: true
         port: 8443
         protocol: https
-        
+
 podOptions:
   automountServiceAccountToken: true
-        
+
 workload:
   main:
     podSpec:
       containers:
         main:
           args:
-            - '--http-endpoint=:{{ .Values.service.main.ports.main.port }}'
-            - '--leader-election=true'
-            - '--leader-election-namespace={{ .Release.Namespace }}'
+            - "--http-endpoint=:{{ .Values.service.main.ports.main.port }}"
+            - "--leader-election=true"
+            - "--leader-election-namespace={{ .Release.Namespace }}"
           probes:
             liveness:
               path: /metrics
@@ -48,9 +48,9 @@ workload:
         webhook:
           enabled: false
           args:
-            - '--tlsPrivateKeyFile=/etc/snapshot-validation/tls.key'
-            - '--tlsCertFile=/etc/snapshot-validation/tls.crt'
-            - '--port={{ .Values.service.webhook.ports.webhook.port }}'
+            - "--tlsPrivateKeyFile=/etc/snapshot-validation/tls.key"
+            - "--tlsCertFile=/etc/snapshot-validation/tls.crt"
+            - "--port={{ .Values.service.webhook.ports.webhook.port }}"
           probes:
             liveness:
               enabled: true
@@ -67,7 +67,7 @@ workload:
               type: https
               path: /readyz
               port: 8443
-              
+
 metrics:
   main:
     enabled: true
@@ -130,4 +130,4 @@ rbac:
     rules:
       - apiGroups: ["coordination.k8s.io"]
         resources: ["leases"]
-        verbs: ["get", "watch", "list", "delete", "update", "create"]
\ No newline at end of file
+        verbs: ["get", "watch", "list", "delete", "update", "create"]