diff --git a/charts/stable/babybuddy/values.yaml b/charts/stable/babybuddy/values.yaml
index ec4e9b1801e..50ff0ecf4ba 100644
--- a/charts/stable/babybuddy/values.yaml
+++ b/charts/stable/babybuddy/values.yaml
@@ -5,10 +5,7 @@ image:
 
 # See more environment variables in the babybuddy documentation
 # https://github.com/linuxserver/docker-babybuddy#parameters
-env: {}
-  # TZ:
-
-envTpl:
+env:
   DB_ENGINE: "django.db.backends.postgresql"
   DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
   DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
diff --git a/charts/stable/deepstack-cpu/values.yaml b/charts/stable/deepstack-cpu/values.yaml
index 3e8799c6962..01a5b43141f 100644
--- a/charts/stable/deepstack-cpu/values.yaml
+++ b/charts/stable/deepstack-cpu/values.yaml
@@ -18,14 +18,9 @@ podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
-envTpl:
-  # Permissions Settings
-  USER_ID: "{{ .Values.env.PUID }}"
-
 env:
   PUID: 568
-
-  # TZ: UTC
+  USER_ID: "{{ .Values.env.PUID }}"
   VISION-FACE: "True"
   VISION-DETECTION: "True"
   VISION-SCENE: "True"
diff --git a/charts/stable/deepstack-gpu/values.yaml b/charts/stable/deepstack-gpu/values.yaml
index 7834ce950e9..7a26f89f1f2 100644
--- a/charts/stable/deepstack-gpu/values.yaml
+++ b/charts/stable/deepstack-gpu/values.yaml
@@ -18,14 +18,9 @@ podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
-envTpl:
-  # Permissions Settings
-  USER_ID: "{{ .Values.env.PUID }}"
-
 env:
   PUID: 568
-
-  # TZ: UTC
+  USER_ID: "{{ .Values.env.PUID }}"
   VISION-FACE: "True"
   VISION-DETECTION: "True"
   VISION-SCENE: "True"
diff --git a/charts/stable/dsmr-reader/values.yaml b/charts/stable/dsmr-reader/values.yaml
index 582c8d89586..675d2825d2e 100644
--- a/charts/stable/dsmr-reader/values.yaml
+++ b/charts/stable/dsmr-reader/values.yaml
@@ -11,6 +11,11 @@ image:
 env:
   # -- Set the container timezone
   TZ: UTC
+  DJANGO_TIME_ZONE: "{{ .Values.env.TZ }}"
+  DJANGO_DATABASE_ENGINE: "django.db.backends.postgresql"
+  DJANGO_DATABASE_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
+  DJANGO_DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}"
+  DJANGO_DATABASE_PORT: "5432"
 
 securityContext:
   readOnlyRootFilesystem: false
@@ -20,13 +25,6 @@ podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
-envTpl:
-  DJANGO_TIME_ZONE: "{{ .Values.env.TZ }}"
-  DJANGO_DATABASE_ENGINE: "django.db.backends.postgresql"
-  DJANGO_DATABASE_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
-  DJANGO_DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}"
-  DJANGO_DATABASE_PORT: "5432"
-
 envValueFrom:
   DJANGO_DATABASE_PASSWORD:
     secretKeyRef:
diff --git a/charts/stable/etherpad/values.yaml b/charts/stable/etherpad/values.yaml
index 465e604bda5..1f83da2631b 100644
--- a/charts/stable/etherpad/values.yaml
+++ b/charts/stable/etherpad/values.yaml
@@ -8,9 +8,7 @@ secret: {}
 # See more environment variables in the etherpad documentation
 # https://github.com/ether/etherpad-lite/blob/develop/doc/docker.md
 # For Mariadb, use DB_TYPE: mysql https://github.com/ether/etherpad-lite/issues/4214
-env: {}
-
-envTpl:
+env:
   DB_TYPE: "postgres"
   DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
   DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml
index 71659e46e84..cc5b51bbe3b 100644
--- a/charts/stable/handbrake/values.yaml
+++ b/charts/stable/handbrake/values.yaml
@@ -25,15 +25,12 @@ service:
         port: 10055
         targetPort: 5900
 
-# All values here are set as the docker defaults.
-envTpl:
-  # Permissions Settings
-  USER_ID: "{{ .Values.env.PUID }}"
 secret:
   VNC_PASSWORD: ""
 env:
   # Permissions Settings
   PUID: 568
+  USER_ID: "{{ .Values.env.PUID }}"
   # General Settings
   KEEP_APP_RUNNING: 0
   CLEAN_TMP_DIR: 1
diff --git a/charts/stable/jdownloader2/values.yaml b/charts/stable/jdownloader2/values.yaml
index 6a62e02bd4e..1aa5e959267 100644
--- a/charts/stable/jdownloader2/values.yaml
+++ b/charts/stable/jdownloader2/values.yaml
@@ -32,15 +32,12 @@ service:
         port: 10056
         targetPort: 5900
 
-# All values here are set as the docker defaults.
-envTpl:
-  # Permissions Settings
-  USER_ID: "{{ .Values.env.PUID }}"
 secret:
   VNC_PASSWORD: ""
 env:
   # Permissions Settings
   PUID: 568
+  USER_ID: "{{ .Values.env.PUID }}"
   # General Settings
   KEEP_APP_RUNNING: 0
   CLEAN_TMP_DIR: 1
diff --git a/charts/stable/joplin-server/values.yaml b/charts/stable/joplin-server/values.yaml
index 9fc0f1919d1..338e72c32dc 100644
--- a/charts/stable/joplin-server/values.yaml
+++ b/charts/stable/joplin-server/values.yaml
@@ -23,8 +23,6 @@ env:
   APP_BASE_URL: https://joplin.domain
   # -- joplin-server listening port (same as Service port)
   APP_PORT: 22300
-
-envTpl:
   DB_CLIENT: "pg"
   POSTGRES_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}"
   POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}"
diff --git a/charts/stable/kanboard/values.yaml b/charts/stable/kanboard/values.yaml
index 0fdcc017e2b..ac6f19a69ea 100644
--- a/charts/stable/kanboard/values.yaml
+++ b/charts/stable/kanboard/values.yaml
@@ -24,8 +24,6 @@ env:
   MAIL_CONFIGURATION: false
   # -- log driver: syslog, stderr, stdout or file
   LOG_DRIVER: stdout
-
-envTpl:
   DB_DRIVER: "postgres"
   DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
   DB_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}"
diff --git a/charts/stable/logitech-media-server/values.yaml b/charts/stable/logitech-media-server/values.yaml
index c5040567fa8..f42f1f9622f 100644
--- a/charts/stable/logitech-media-server/values.yaml
+++ b/charts/stable/logitech-media-server/values.yaml
@@ -5,13 +5,11 @@ image:
 env:
   # Permissions Settings
   PUID: 568
-
-envTpl:
+  HTTP_PORT: "{{ .Values.service.main.ports.main.port }}"
   # Port to host the web service on. This will be the internal container port exposed and needs to be the same as the public service port.
   # The main http port always has to be a 1:1 mapping between external and internal port.
   # You can't just map it like -p 9002:9000, as Logitech Media Server is telling players on which port to connect.
   # Therefore if you have to use a different http port for LMS (other than 9000) you'll have to set the HTTP_PORT environment variable
-  HTTP_PORT: "{{ .Values.service.main.ports.main.port }}"
 
 securityContext:
   readOnlyRootFilesystem: false
diff --git a/charts/stable/mealie/values.yaml b/charts/stable/mealie/values.yaml
index 92c16bf096b..7d58c10a963 100644
--- a/charts/stable/mealie/values.yaml
+++ b/charts/stable/mealie/values.yaml
@@ -19,8 +19,6 @@ podSecurityContext:
 env:
   # -- Set the container timezone
   TZ: UTC
-
-envTpl:
   DB_TYPE: postgres
   POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}"
   POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}"
diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml
index 6a111308ee8..77a7b97ab54 100644
--- a/charts/stable/nextcloud/values.yaml
+++ b/charts/stable/nextcloud/values.yaml
@@ -30,8 +30,6 @@ secret:
   NEXTCLOUD_ADMIN_PASSWORD: "adminpass"
 env:
   TRUSTED_PROXIES: "172.16.0.0/16"
-
-envTpl:
   POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}"
   POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}"
 
diff --git a/charts/stable/odoo/values.yaml b/charts/stable/odoo/values.yaml
index 108b332b659..d79fe8c062e 100644
--- a/charts/stable/odoo/values.yaml
+++ b/charts/stable/odoo/values.yaml
@@ -9,11 +9,9 @@ secret: {}
 
 # See more environment variables in the odoo documentation
 # https://github.com/nicholaswilde/docker-odoo
-env: {}
-    # HOST: "odoo-db"
-
-envTpl:
+env:
   USER: "{{ .Values.postgresql.postgresqlUsername }}"
+    # HOST: "odoo-db"
 
 envValueFrom:
   PASSWORD:
diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml
index 3e39ffd56f6..fca22219c35 100644
--- a/charts/stable/paperless-ng/values.yaml
+++ b/charts/stable/paperless-ng/values.yaml
@@ -22,8 +22,6 @@ env:
   PAPERLESS_STATICDIR: "/static/"
   PAPERLESS_CONSUMPTION_DIR: "/consume/"
   PAPERLESS_MEDIA_ROOT: "/media/"
-
-envTpl:
   USERMAP_UID: "{{ .Values.env.PUID }}"
   USERMAP_GID: "{{ .Values.env.PGID }}"
   PAPERLESS_TIME_ZONE: "{{ .Values.env.TZ }}"
diff --git a/charts/stable/recipes/values.yaml b/charts/stable/recipes/values.yaml
index 20e644f42c7..3eb062f0931 100644
--- a/charts/stable/recipes/values.yaml
+++ b/charts/stable/recipes/values.yaml
@@ -29,8 +29,6 @@ env:
   FRACTION_PREF_DEFAULT: 0
   COMMENT_PREF_DEFAULT: 1
   SHOPPING_MIN_AUTOSYNC_INTERVAL: 5
-
-envTpl:
   TIMEZONE: "{{ .Values.env.TZ }}"
   DB_ENGINE: "django.db.backends.postgresql"
   POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}"
diff --git a/charts/stable/shiori/values.yaml b/charts/stable/shiori/values.yaml
index 9c2bb2e85b1..1e9843f4331 100644
--- a/charts/stable/shiori/values.yaml
+++ b/charts/stable/shiori/values.yaml
@@ -17,8 +17,6 @@ podSecurityContext:
 env:
   # TZ:
   PUID: 568
-
-envTpl:
   SHIORI_PG_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
   SHIORI_PG_USER: "{{ .Values.postgresql.postgresqlUsername }}"
 
diff --git a/charts/stable/statping/values.yaml b/charts/stable/statping/values.yaml
index d853cf9c076..56285541fbc 100644
--- a/charts/stable/statping/values.yaml
+++ b/charts/stable/statping/values.yaml
@@ -28,7 +28,6 @@ env:
   USE_CDN: false
   # -- Disable logs from appearing and writing to disk
   DISABLE_LOGS: false
-envTpl:
   DB_CONN: "postgres"
   DB_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}"
   DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
diff --git a/charts/stable/teedy/values.yaml b/charts/stable/teedy/values.yaml
index 55e53676aa7..46c6854ed02 100644
--- a/charts/stable/teedy/values.yaml
+++ b/charts/stable/teedy/values.yaml
@@ -28,7 +28,6 @@ env:
   DOCS_SMTP_HOSTNAME: ""
   # -- The port of the SMTP-Server which should be used
   DOCS_SMTP_PORT: 0
-envTpl:
   DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}"
 
 envValueFrom:
diff --git a/charts/stable/traccar/values.yaml b/charts/stable/traccar/values.yaml
index 7a9dbec1d36..3c3a8142cca 100644
--- a/charts/stable/traccar/values.yaml
+++ b/charts/stable/traccar/values.yaml
@@ -13,8 +13,6 @@ env:
   CONFIG_USE_ENVIRONMENT_VARIABLES: true
   # -- Set application to log to stdout
   LOGGER_CONSOLE: true
-
-envTpl:
   DATABASE_DRIVER: "org.postgresql.Driver"
   DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}"
 
diff --git a/charts/stable/tt-rss/values.yaml b/charts/stable/tt-rss/values.yaml
index b07702a5784..e8c8628532e 100644
--- a/charts/stable/tt-rss/values.yaml
+++ b/charts/stable/tt-rss/values.yaml
@@ -25,8 +25,6 @@ persistence:
 env:
   # -- External URL you use to connect to the RSS (the one you enter in your browser)
   TTRSS_SELF_URL_PATH: ""
-
-envTpl:
   TTRSS_DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
   TTRSS_DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
   TTRSS_DB_PORT: "5432"
diff --git a/charts/stable/unifi/values.yaml b/charts/stable/unifi/values.yaml
index 148b53d2177..9871379dc46 100644
--- a/charts/stable/unifi/values.yaml
+++ b/charts/stable/unifi/values.yaml
@@ -3,11 +3,6 @@ image:
   tag: v6.5.55@sha256:c74556ef862dab1534ed848d6efa57f40a11399172230aec57e5e850ce542921
   pullPolicy: IfNotPresent
 
-envTpl:
-  # Permissions Settings
-  UNIFI_GID: "{{ .Values.env.PUID }}"
-  UNIFI_UID: "{{ .Values.podSecurityContext.fsGroup }}"
-
 service:
   main:
     ports:
@@ -62,6 +57,10 @@ podSecurityContext:
 env:
   # TZ:
   PUID: 568
+  # Permissions Settings
+  UNIFI_GID: "{{ .Values.env.PUID }}"
+  UNIFI_UID: "{{ .Values.podSecurityContext.fsGroup }}"
+
 persistence:
   config:
     enabled: true
diff --git a/charts/stable/vaultwarden/values.yaml b/charts/stable/vaultwarden/values.yaml
index 94daf990b0c..70e53e1f340 100644
--- a/charts/stable/vaultwarden/values.yaml
+++ b/charts/stable/vaultwarden/values.yaml
@@ -17,9 +17,7 @@ service:
         port: 3012
         targetPort: 3012
 
-env: {}
-
-envTpl:
+env:
   DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}"
 
 envFrom:
@@ -148,7 +146,6 @@ persistence:
     enabled: true
     mountPath: "/data"
 
-
 # Enabled postgres
 postgresql:
   enabled: true
diff --git a/charts/stable/wikijs/values.yaml b/charts/stable/wikijs/values.yaml
index b193daaf753..e0eefd5bf30 100644
--- a/charts/stable/wikijs/values.yaml
+++ b/charts/stable/wikijs/values.yaml
@@ -20,8 +20,6 @@ env:
   # -- Set the container timezone
   PUID: 568
   TZ: UTC
-
-envTpl:
   DB_TYPE: "postgres"
   DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
   DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"