diff --git a/.tools/tests/charts/common-test_spec.rb b/.tools/tests/charts/common-test_spec.rb
index e37b2b7dc51..e6ed81f8658 100644
--- a/.tools/tests/charts/common-test_spec.rb
+++ b/.tools/tests/charts/common-test_spec.rb
@@ -42,12 +42,14 @@ class Test < ChartTest
       it 'defaults to false = runAs 568' do
         jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal 568
         jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal 568
+        jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal true
       end
 
       it 'can be enabled = runAs nil' do
         chart.value startAsRoot: true
         jq('.spec.template.spec.securityContext.runAsUser', resource('Deployment')).must_equal nil
         jq('.spec.template.spec.securityContext.runAsGroup', resource('Deployment')).must_equal nil
+        jq('.spec.template.spec.securityContext.runAsNonRoot', resource('Deployment')).must_equal nil
       end
     end
 
diff --git a/charts/bazarr/2.0.0/charts/common-2.0.0.tgz b/charts/bazarr/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/bazarr/2.0.0/charts/common-2.0.0.tgz and b/charts/bazarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/bazarr/2.0.0/ix_values.yaml b/charts/bazarr/2.0.0/ix_values.yaml
index f64b89cc16b..419abb8f105 100644
--- a/charts/bazarr/2.0.0/ix_values.yaml
+++ b/charts/bazarr/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/bazarr
+  repository: ghcr.io/k8s-at-home/bazarr
   pullPolicy: IfNotPresent
-  tag: version-v0.9.0.5
-
-startAsRoot: true
+  tag: v0.9.3-beta.6
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/bazarr/2.0.0/test_values.yaml b/charts/bazarr/2.0.0/test_values.yaml
index 1f586e82c4d..18157ab225b 100644
--- a/charts/bazarr/2.0.0/test_values.yaml
+++ b/charts/bazarr/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for Bazarr.
 
 image:
-  repository: linuxserver/bazarr
+  repository: ghcr.io/k8s-at-home/bazarr
   pullPolicy: IfNotPresent
-  tag: version-v0.9.0.5
+  tag: v0.9.3-beta.6
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz b/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz and b/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz b/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz and b/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/deluge/2.0.0/charts/common-2.0.0.tgz b/charts/deluge/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/deluge/2.0.0/charts/common-2.0.0.tgz and b/charts/deluge/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/emby/2.0.0/questions.yaml b/charts/emby/2.0.0/questions.yaml
index f845113a70b..c7e9cf6d270 100644
--- a/charts/emby/2.0.0/questions.yaml
+++ b/charts/emby/2.0.0/questions.yaml
@@ -357,6 +357,16 @@ questions:
                   type: hostpath
                   required: true
 
+  # Specify GPU configuration
+  - variable: gpuConfiguration
+    label: "GPU Configuration"
+    group: "Storage and Devices"
+    schema:
+      type: dict
+      $ref:
+        - "definitions/gpuConfiguration"
+      attrs: []
+
   - variable: ingress
     label: ""
     group: "Reverse Proxy Configuration"
diff --git a/charts/esphome/2.0.0/charts/common-2.0.0.tgz b/charts/esphome/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/esphome/2.0.0/charts/common-2.0.0.tgz and b/charts/esphome/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/freshrss/2.0.0/charts/common-2.0.0.tgz b/charts/freshrss/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/freshrss/2.0.0/charts/common-2.0.0.tgz and b/charts/freshrss/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/gaps/2.0.0/charts/common-2.0.0.tgz b/charts/gaps/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/gaps/2.0.0/charts/common-2.0.0.tgz and b/charts/gaps/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/grocy/2.0.0/charts/common-2.0.0.tgz b/charts/grocy/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/grocy/2.0.0/charts/common-2.0.0.tgz and b/charts/grocy/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/handbrake/2.0.0/charts/common-2.0.0.tgz b/charts/handbrake/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/handbrake/2.0.0/charts/common-2.0.0.tgz and b/charts/handbrake/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/heimdall/2.0.0/charts/common-2.0.0.tgz b/charts/heimdall/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/heimdall/2.0.0/charts/common-2.0.0.tgz and b/charts/heimdall/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz b/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz and b/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/jackett/2.0.0/charts/common-2.0.0.tgz b/charts/jackett/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/jackett/2.0.0/charts/common-2.0.0.tgz and b/charts/jackett/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/jackett/2.0.0/ix_values.yaml b/charts/jackett/2.0.0/ix_values.yaml
index 8362ffdfdde..d74f30176f7 100644
--- a/charts/jackett/2.0.0/ix_values.yaml
+++ b/charts/jackett/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/jackett
+  repository: ghcr.io/k8s-at-home/jackett
   pullPolicy: IfNotPresent
-  tag: version-v0.17.153
-
-startAsRoot: true
+  tag: v0.17.656
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/jackett/2.0.0/test_values.yaml b/charts/jackett/2.0.0/test_values.yaml
index c301253a75e..d84e6eb1819 100644
--- a/charts/jackett/2.0.0/test_values.yaml
+++ b/charts/jackett/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for Jackett.
 
 image:
-  repository: linuxserver/jackett
+  repository: ghcr.io/k8s-at-home/jackett
   pullPolicy: IfNotPresent
-  tag: version-v0.16.2106
+  tag: v0.17.656
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz b/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz and b/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/jellyfin/2.0.0/ix_values.yaml b/charts/jellyfin/2.0.0/ix_values.yaml
index c24370f6ab3..489e46e36a5 100644
--- a/charts/jellyfin/2.0.0/ix_values.yaml
+++ b/charts/jellyfin/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/jellyfin
+  repository: jellyfin/jellyfin
   pullPolicy: IfNotPresent
-  tag: version-10.6.4-1
-
-startAsRoot: true
+  tag: 10.6.4
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/jellyfin/2.0.0/questions.yaml b/charts/jellyfin/2.0.0/questions.yaml
index 220bf9880d6..d262e3a90b2 100644
--- a/charts/jellyfin/2.0.0/questions.yaml
+++ b/charts/jellyfin/2.0.0/questions.yaml
@@ -357,6 +357,16 @@ questions:
                   type: hostpath
                   required: true
 
+  # Specify GPU configuration
+  - variable: gpuConfiguration
+    label: "GPU Configuration"
+    group: "Storage and Devices"
+    schema:
+      type: dict
+      $ref:
+        - "definitions/gpuConfiguration"
+      attrs: []
+
   - variable: ingress
     label: ""
     group: "Reverse Proxy Configuration"
diff --git a/charts/jellyfin/2.0.0/test_values.yaml b/charts/jellyfin/2.0.0/test_values.yaml
index 73a53f8eaa7..f4642687320 100644
--- a/charts/jellyfin/2.0.0/test_values.yaml
+++ b/charts/jellyfin/2.0.0/test_values.yaml
@@ -2,15 +2,13 @@
 # Default values for jellyfin.
 
 image:
-  repository: linuxserver/jellyfin
+  repository: jellyfin/jellyfin
   pullPolicy: IfNotPresent
-  tag: version-10.6.4-1
+  tag: 10.6.4
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/kms/2.0.0/charts/common-2.0.0.tgz b/charts/kms/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/kms/2.0.0/charts/common-2.0.0.tgz and b/charts/kms/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz b/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz and b/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/lidarr/2.0.0/charts/common-2.0.0.tgz b/charts/lidarr/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/lidarr/2.0.0/charts/common-2.0.0.tgz and b/charts/lidarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/lidarr/2.0.0/ix_values.yaml b/charts/lidarr/2.0.0/ix_values.yaml
index fa6a027e8a5..513ae90c696 100644
--- a/charts/lidarr/2.0.0/ix_values.yaml
+++ b/charts/lidarr/2.0.0/ix_values.yaml
@@ -5,12 +5,10 @@
 ##
 
 image:
-  repository: linuxserver/lidarr
+  repository: ghcr.io/k8s-at-home/lidarr
   pullPolicy: IfNotPresent
   tag: version-0.8.0.1886
 
-startAsRoot: true
-
 probes:
     liveness:
       enabled: true
diff --git a/charts/lidarr/2.0.0/test_values.yaml b/charts/lidarr/2.0.0/test_values.yaml
index d3a7ab403cc..bd2ff1002ab 100644
--- a/charts/lidarr/2.0.0/test_values.yaml
+++ b/charts/lidarr/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for Lidarr.
 
 image:
-  repository: linuxserver/lidarr
+  repository: ghcr.io/k8s-at-home/lidarr
   pullPolicy: IfNotPresent
-  tag: version-0.8.0.1886
+  tag: v0.8.0.2082
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/lychee/2.0.0/charts/common-2.0.0.tgz b/charts/lychee/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/lychee/2.0.0/charts/common-2.0.0.tgz and b/charts/lychee/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/navidrome/2.0.0/charts/common-2.0.0.tgz b/charts/navidrome/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/navidrome/2.0.0/charts/common-2.0.0.tgz and b/charts/navidrome/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/node-red/2.0.0/charts/common-2.0.0.tgz b/charts/node-red/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/node-red/2.0.0/charts/common-2.0.0.tgz and b/charts/node-red/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/nzbget/2.0.0/charts/common-2.0.0.tgz b/charts/nzbget/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/nzbget/2.0.0/charts/common-2.0.0.tgz and b/charts/nzbget/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/nzbget/2.0.0/ix_values.yaml b/charts/nzbget/2.0.0/ix_values.yaml
index c5e877e9356..e1e833b6a64 100644
--- a/charts/nzbget/2.0.0/ix_values.yaml
+++ b/charts/nzbget/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/nzbget
+  repository: ghcr.io/k8s-at-home/nzbget
   pullPolicy: IfNotPresent
-  tag: version-v21.0
-
-startAsRoot: true
+  tag: v21.0
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/nzbget/2.0.0/test_values.yaml b/charts/nzbget/2.0.0/test_values.yaml
index d3bcb17541e..bffdf1d6b1d 100644
--- a/charts/nzbget/2.0.0/test_values.yaml
+++ b/charts/nzbget/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for nzbget.
 
 image:
-  repository: linuxserver/nzbget
+  repository: ghcr.io/k8s-at-home/nzbget
   pullPolicy: IfNotPresent
-  tag: version-v21.0
+  tag: v21.0
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz b/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz and b/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/nzbhydra/2.0.0/ix_values.yaml b/charts/nzbhydra/2.0.0/ix_values.yaml
index 8429553dd74..f5fbb47c07d 100644
--- a/charts/nzbhydra/2.0.0/ix_values.yaml
+++ b/charts/nzbhydra/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/nzbhydra2
+  repository: ghcr.io/k8s-at-home/nzbhydra2
   pullPolicy: IfNotPresent
-  tag: version-v3.8.1
-
-startAsRoot: true
+  tag: v3.13.0
 
 probes:
   liveness:
diff --git a/charts/nzbhydra/2.0.0/test_values.yaml b/charts/nzbhydra/2.0.0/test_values.yaml
index 09a85fe714b..5fa1c936123 100644
--- a/charts/nzbhydra/2.0.0/test_values.yaml
+++ b/charts/nzbhydra/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for nzbhydra.
 
 image:
-  repository: linuxserver/nzbhydra2
+  repository: ghcr.io/k8s-at-home/nzbhydra2
   pullPolicy: IfNotPresent
-  tag: version-v3.8.1
+  tag: v3.13.0
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/ombi/2.0.0/charts/common-2.0.0.tgz b/charts/ombi/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/ombi/2.0.0/charts/common-2.0.0.tgz and b/charts/ombi/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/organizr/2.0.0/charts/common-2.0.0.tgz b/charts/organizr/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/organizr/2.0.0/charts/common-2.0.0.tgz and b/charts/organizr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/qbittorrent/2.0.0/Chart.yaml b/charts/qbittorrent/2.0.0/Chart.yaml
index f25d0679df4..4ace0829690 100644
--- a/charts/qbittorrent/2.0.0/Chart.yaml
+++ b/charts/qbittorrent/2.0.0/Chart.yaml
@@ -7,7 +7,7 @@ version: 1.6.4
 version: 2.0.0
 >>>>>>> [Common] Refactor Services (#212):charts/qbittorrent/2.0.0/Chart.yaml
 upstream_version: 7.2.1
-appVersion: "latest"
+appVersion: "auto"
 description: qBittorrent is a cross-platform free and open-source BitTorrent client
 type: application
 deprecated: false
diff --git a/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz b/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz and b/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/qbittorrent/2.0.0/ix_values.yaml b/charts/qbittorrent/2.0.0/ix_values.yaml
index 5d2fd4b18be..29108a7bd85 100644
--- a/charts/qbittorrent/2.0.0/ix_values.yaml
+++ b/charts/qbittorrent/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/qbittorrent
+  repository: ghcr.io/k8s-at-home/qbittorrent
   pullPolicy: IfNotPresent
-  tag: latest
-
-startAsRoot: true
+  tag: v4.3.3
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/qbittorrent/2.0.0/test_values.yaml b/charts/qbittorrent/2.0.0/test_values.yaml
index 0f680b74b1d..e687c2026ba 100644
--- a/charts/qbittorrent/2.0.0/test_values.yaml
+++ b/charts/qbittorrent/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for qbittorrent.
 
 image:
-  repository: linuxserver/qbittorrent
+  repository: ghcr.io/k8s-at-home/qbittorrent
   pullPolicy: IfNotPresent
-  tag: latest
+  tag: v4.3.3
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 env: {}
     # TZ: UTC
   # PUID: 1001
diff --git a/charts/radarr/2.0.0/charts/common-2.0.0.tgz b/charts/radarr/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/radarr/2.0.0/charts/common-2.0.0.tgz and b/charts/radarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/radarr/2.0.0/ix_values.yaml b/charts/radarr/2.0.0/ix_values.yaml
index 7d075beba14..5ac6f820cc7 100644
--- a/charts/radarr/2.0.0/ix_values.yaml
+++ b/charts/radarr/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/radarr
+  repository: ghcr.io/k8s-at-home/radarr
   pullPolicy: IfNotPresent
-  tag: version-3.0.0.3989
-
-startAsRoot: true
+  tag: v3.0.2.4552
 
 probes:
   liveness:
diff --git a/charts/radarr/2.0.0/test_values.yaml b/charts/radarr/2.0.0/test_values.yaml
index c7d84cd3f09..d78479fa3ba 100644
--- a/charts/radarr/2.0.0/test_values.yaml
+++ b/charts/radarr/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for Radarr.
 
 image:
-  repository: linuxserver/radarr
+  repository: ghcr.io/k8s-at-home/radarr
   pullPolicy: IfNotPresent
-  tag: version-3.0.0.3989
+  tag: v3.0.2.4552
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/readarr/2.0.0/charts/common-2.0.0.tgz b/charts/readarr/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/readarr/2.0.0/charts/common-2.0.0.tgz and b/charts/readarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz b/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz and b/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/sabnzbd/2.0.0/ix_values.yaml b/charts/sabnzbd/2.0.0/ix_values.yaml
index ba46914977e..406191a31fc 100644
--- a/charts/sabnzbd/2.0.0/ix_values.yaml
+++ b/charts/sabnzbd/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/sabnzbd
+  repository: ghcr.io/k8s-at-home/sabnzbd
   pullPolicy: IfNotPresent
-  tag: version-3.1.0
-
-startAsRoot: true
+  tag: v3.2.0
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/sabnzbd/2.0.0/test_values.yaml b/charts/sabnzbd/2.0.0/test_values.yaml
index ee271c5875d..58f24da10ef 100644
--- a/charts/sabnzbd/2.0.0/test_values.yaml
+++ b/charts/sabnzbd/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for Sabnzbd.
 
 image:
-  repository: linuxserver/sabnzbd
+  repository: ghcr.io/k8s-at-home/sabnzbd
   pullPolicy: IfNotPresent
-  tag: version-3.1.0
+  tag: v3.2.0
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/sonarr/2.0.0/charts/common-2.0.0.tgz b/charts/sonarr/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/sonarr/2.0.0/charts/common-2.0.0.tgz and b/charts/sonarr/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/sonarr/2.0.0/ix_values.yaml b/charts/sonarr/2.0.0/ix_values.yaml
index 47f33baf9ac..1534ebe6681 100644
--- a/charts/sonarr/2.0.0/ix_values.yaml
+++ b/charts/sonarr/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: linuxserver/sonarr
+  repository: ghcr.io/k8s-at-home/sonarr
   pullPolicy: IfNotPresent
-  tag: version-3.0.4.993
-
-startAsRoot: true
+  tag: v3.0.5.1143
 
 probes:
     liveness:
diff --git a/charts/sonarr/2.0.0/test_values.yaml b/charts/sonarr/2.0.0/test_values.yaml
index f39e4b46d15..a5ace5cd74d 100644
--- a/charts/sonarr/2.0.0/test_values.yaml
+++ b/charts/sonarr/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for Sonarr.
 
 image:
-  repository: linuxserver/sonarr
+  repository: ghcr.io/k8s-at-home/sonarr
   pullPolicy: IfNotPresent
-  tag: version-3.0.4.993
+  tag: v3.0.5.1143
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/tautulli/2.0.0/charts/common-2.0.0.tgz b/charts/tautulli/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/tautulli/2.0.0/charts/common-2.0.0.tgz and b/charts/tautulli/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/tautulli/2.0.0/ix_values.yaml b/charts/tautulli/2.0.0/ix_values.yaml
index 6297b11a59e..3bd837e6d63 100644
--- a/charts/tautulli/2.0.0/ix_values.yaml
+++ b/charts/tautulli/2.0.0/ix_values.yaml
@@ -5,11 +5,9 @@
 ##
 
 image:
-  repository: tautulli/tautulli
+  repository: ghcr.io/k8s-at-home/tautulli
   pullPolicy: IfNotPresent
-  tag: v2.6.6
-
-startAsRoot: true
+  tag: v2.6.7
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/charts/tautulli/2.0.0/test_values.yaml b/charts/tautulli/2.0.0/test_values.yaml
index cf12cf8815f..5ea335e2f9b 100644
--- a/charts/tautulli/2.0.0/test_values.yaml
+++ b/charts/tautulli/2.0.0/test_values.yaml
@@ -1,15 +1,13 @@
 # Default values for Tautulli.
 
 image:
-  repository: tautulli/tautulli
+  repository: ghcr.io/k8s-at-home/tautulli
   pullPolicy: IfNotPresent
-  tag: v2.6.6
+  tag: v2.6.7
 
 strategy:
   type: Recreate
 
-startAsRoot: true
-
 services:
   main:
     port:
diff --git a/charts/traefik/2.0.0/charts/common-2.0.0.tgz b/charts/traefik/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/traefik/2.0.0/charts/common-2.0.0.tgz and b/charts/traefik/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/transmission/2.0.0/charts/common-2.0.0.tgz b/charts/transmission/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/transmission/2.0.0/charts/common-2.0.0.tgz and b/charts/transmission/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/truecommand/2.0.0/charts/common-2.0.0.tgz b/charts/truecommand/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/truecommand/2.0.0/charts/common-2.0.0.tgz and b/charts/truecommand/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz b/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz and b/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/unifi/2.0.0/charts/common-2.0.0.tgz b/charts/unifi/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/unifi/2.0.0/charts/common-2.0.0.tgz and b/charts/unifi/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz b/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz
index a4a492aafb3..07f84ccf14b 100644
Binary files a/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz and b/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz differ
diff --git a/library/common/templates/lib/controller/_container.tpl b/library/common/templates/lib/controller/_container.tpl
index 98e1c086da7..583913f3a96 100644
--- a/library/common/templates/lib/controller/_container.tpl
+++ b/library/common/templates/lib/controller/_container.tpl
@@ -98,16 +98,12 @@ The main container included in the controller.
   {{- end }}
   {{- end }}
   {{- include "common.controller.probes" . | nindent 2 }}
-  {{- with .Values.resources }}
   resources:
+  {{- with .Values.resources }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- if and .Values.gpuConfiguration .Values.resources }}
+  {{- if and .Values.gpuConfiguration }}
     limits:
-      {{- toYaml .Values.gpuConfiguration | nindent 14 }}
-  {{- else if .Values.gpuConfiguration }}
-  resources:
-    limits:
-      {{- toYaml .Values.gpuConfiguration | nindent 14 }}
+      {{- toYaml .Values.gpuConfiguration | nindent 6 }}
   {{- end }}
 {{- end -}}
diff --git a/library/common/templates/lib/controller/_pod.tpl b/library/common/templates/lib/controller/_pod.tpl
index e61a449426d..bcc518b7ca7 100644
--- a/library/common/templates/lib/controller/_pod.tpl
+++ b/library/common/templates/lib/controller/_pod.tpl
@@ -30,6 +30,7 @@ securityContext:
 {{- if not .Values.startAsRoot }}
   runAsUser: {{ .Values.PUID }}
   runAsGroup: {{ .Values.PGID }}
+  runAsNonRoot: true
 {{- end }}
 {{- with .Values.podSecurityContext }}
   {{- toYaml . | nindent 2 }}