diff --git a/charts/stable/firefox-syncserver/Chart.yaml b/charts/stable/firefox-syncserver/Chart.yaml
index e899d6e32da..7816243d689 100644
--- a/charts/stable/firefox-syncserver/Chart.yaml
+++ b/charts/stable/firefox-syncserver/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 appVersion: "1.8.0"
-version: 12.0.22
+version: 13.0.0
 kubeVersion: ">=1.16.0-0"
 name: firefox-syncserver
 description: This is an all-in-one package for running a self-hosted Firefox Sync server.
@@ -18,11 +18,8 @@ sources:
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
-  - condition: postgresql.enabled
-    name: postgresql
-    repository: https://deps.truecharts.org/
-    version: 11.0.31
+    version: 12.6.1
+
 maintainers:
   - email: info@truecharts.org
     name: TrueCharts
@@ -31,4 +28,3 @@ annotations:
   truecharts.org/catagories: |
     - media
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/stable/firefox-syncserver/questions.yaml b/charts/stable/firefox-syncserver/questions.yaml
index 584b5f9251a..5abeee89356 100644
--- a/charts/stable/firefox-syncserver/questions.yaml
+++ b/charts/stable/firefox-syncserver/questions.yaml
@@ -10,66 +10,61 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: FF_SYNCSERVER_SECRET
+                                        label: "FF_SYNCSERVER_SECRET"
+                                        description: "Sets the FF_SYNCSERVER_SECRET env var"
+                                        schema:
+                                          type: string
+                                          default: "changeme"
+                                      - variable: FF_SYNCSERVER_PUBLIC_URL
+                                        label: "FF_SYNCSERVER_PUBLIC_URL"
+                                        description: "Sets the FF_SYNCSERVER_PUBLIC_URL env var"
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: FF_SYNCSERVER_FORCE_WSGI_ENVIRON
+                                        label: "FF_SYNCSERVER_FORCE_WSGI_ENVIRON"
+                                        description: "Sets the FF_SYNCSERVER_FORCE_WSGI_ENVIRON env var"
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                      - variable: FF_SYNCSERVER_ACCESSLOG
+                                        label: "FF_SYNCSERVER_ACCESSLOG"
+                                        description: "Sets the FF_SYNCSERVER_ACCESSLOG env var"
+                                        schema:
+                                          type: boolean
+                                          default: false
+                                      - variable: FF_SYNCSERVER_LOGLEVEL
+                                        label: "FF_SYNCSERVER_LOGLEVEL"
+                                        description: "Sets the FF_SYNCSERVER_LOGLEVEL env var"
+                                        schema:
+                                          type: string
+                                          default: "info"
+                                      - variable: FF_SYNCSERVER_ALLOW_NEW_USERS
+                                        label: "FF_SYNCSERVER_ALLOW_NEW_USERS"
+                                        description: "Sets the FF_SYNCSERVER_ALLOW_NEW_USERS env var"
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                      - variable: FF_SYNCSERVER_FORWARDED_ALLOW_IPS
+                                        label: "FF_SYNCSERVER_FORWARDED_ALLOW_IPS"
+                                        description: "Sets the FF_SYNCSERVER_FORWARDED_ALLOW_IPS env var"
+                                        schema:
+                                          type: string
+                                          default: "*"
+
 # Include{containerBasic}
 # Include{containerAdvanced}
-
-  - variable: secretEnv
-    group: "App Configuration"
-    label: "Image Secrets"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: FF_SYNCSERVER_SECRET
-          label: "FF_SYNCSERVER_SECRET"
-          description: "Sets the FF_SYNCSERVER_SECRET env var"
-          schema:
-            type: string
-            default: "changeme"
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: FF_SYNCSERVER_PUBLIC_URL
-          label: "FF_SYNCSERVER_PUBLIC_URL"
-          description: "Sets the FF_SYNCSERVER_PUBLIC_URL env var"
-          schema:
-            type: string
-            default: ""
-        - variable: FF_SYNCSERVER_FORCE_WSGI_ENVIRON
-          label: "FF_SYNCSERVER_FORCE_WSGI_ENVIRON"
-          description: "Sets the FF_SYNCSERVER_FORCE_WSGI_ENVIRON env var"
-          schema:
-            type: boolean
-            default: true
-        - variable: FF_SYNCSERVER_ACCESSLOG
-          label: "FF_SYNCSERVER_ACCESSLOG"
-          description: "Sets the FF_SYNCSERVER_ACCESSLOG env var"
-          schema:
-            type: boolean
-            default: false
-        - variable: FF_SYNCSERVER_LOGLEVEL
-          label: "FF_SYNCSERVER_LOGLEVEL"
-          description: "Sets the FF_SYNCSERVER_LOGLEVEL env var"
-          schema:
-            type: string
-            default: "info"
-        - variable: FF_SYNCSERVER_ALLOW_NEW_USERS
-          label: "FF_SYNCSERVER_ALLOW_NEW_USERS"
-          description: "Sets the FF_SYNCSERVER_ALLOW_NEW_USERS env var"
-          schema:
-            type: boolean
-            default: true
-        - variable: FF_SYNCSERVER_FORWARDED_ALLOW_IPS
-          label: "FF_SYNCSERVER_FORWARDED_ALLOW_IPS"
-          description: "Sets the FF_SYNCSERVER_FORWARDED_ALLOW_IPS env var"
-          schema:
-            type: string
-            default: "*"
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -126,12 +121,12 @@ questions:
                 schema:
                   type: int
                   default: 0
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 0
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/firefox-syncserver/templates/NOTES.txt b/charts/stable/firefox-syncserver/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/stable/firefox-syncserver/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/stable/firefox-syncserver/templates/common.yaml b/charts/stable/firefox-syncserver/templates/common.yaml
index c1a366e1cf0..b51394e00a4 100644
--- a/charts/stable/firefox-syncserver/templates/common.yaml
+++ b/charts/stable/firefox-syncserver/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/firefox-syncserver/values.yaml b/charts/stable/firefox-syncserver/values.yaml
index bb4cb85e36b..4846ca3eae5 100644
--- a/charts/stable/firefox-syncserver/values.yaml
+++ b/charts/stable/firefox-syncserver/values.yaml
@@ -4,29 +4,38 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: v1.8.0@sha256:13d5d1beae0e7ea4298224abbc415de837200b8402d676e856601a63dc8432ed
 
-secretEnv:
-  FF_SYNCSERVER_SECRET: "changeme"
-
 securityContext:
-  readOnlyRootFilesystem: false
-  allowPrivilegeEscalation: true
-  runAsNonRoot: false
+  container:
+    readOnlyRootFilesystem: false
+    allowPrivilegeEscalation: true
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
 
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-env:
-  FF_SYNCSERVER_PUBLIC_URL: "firefox-syncserver.192.168.1.189.nip.io"
-  FF_SYNCSERVER_FORCE_WSGI_ENVIRON: true
-  FF_SYNCSERVER_ACCESSLOG: false
-  FF_SYNCSERVER_LOGLEVEL: "info"
-  FF_SYNCSERVER_ALLOW_NEW_USERS: true
-  FF_SYNCSERVER_FORWARDED_ALLOW_IPS: "*"
-  FF_SYNCSERVER_SQLURI:
-    secretKeyRef:
-      name: dbcreds
-      key: url
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              type: tcp
+            readiness:
+              type: tcp
+            startup:
+              type: tcp
+          env:
+            FF_SYNCSERVER_PUBLIC_URL: "firefox-syncserver.192.168.1.189.nip.io"
+            FF_SYNCSERVER_FORCE_WSGI_ENVIRON: true
+            FF_SYNCSERVER_ACCESSLOG: false
+            FF_SYNCSERVER_LOGLEVEL: "info"
+            FF_SYNCSERVER_ALLOW_NEW_USERS: true
+            FF_SYNCSERVER_FORWARDED_ALLOW_IPS: "*"
+            FF_SYNCSERVER_SQLURI:
+              secretKeyRef:
+                name: cnpg-main-urls
+                key: std
+            FF_SYNCSERVER_SECRET: "changeme"
 
 service:
   main:
@@ -34,16 +43,19 @@ service:
       main:
         port: 10051
         targetPort: 5000
+
 persistence:
   config:
     enabled: true
     mountPath: "/config"
+
 # Enabled postgres
-postgresql:
-  enabled: true
-  existingSecret: "dbcreds"
-  postgresqlUsername: firefox-syncserver
-  postgresqlDatabase: firefox-syncserver
+cnpg:
+  main:
+    enabled: true
+    user: firefox-syncserver
+    database: firefox-syncserver
 
 portal:
-  enabled: true
+  open:
+    enabled: true
diff --git a/charts/stable/hammond/Chart.yaml b/charts/stable/hammond/Chart.yaml
index 20965b5077a..d5d55b02fb4 100644
--- a/charts/stable/hammond/Chart.yaml
+++ b/charts/stable/hammond/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.0.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.6.1
 description: A self-hosted vehicle expense tracking system with support for multiple users.
 home: https://truecharts.org/charts/stable/hammond
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/hammond.png
@@ -18,9 +18,8 @@ name: hammond
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/hammond
   - https://github.com/akhilrex/hammond
-version: 4.0.9
+version: 5.0.0
 annotations:
   truecharts.org/catagories: |
     - productivity
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/stable/hammond/questions.yaml b/charts/stable/hammond/questions.yaml
index b245e870307..12ae47b5e39 100644
--- a/charts/stable/hammond/questions.yaml
+++ b/charts/stable/hammond/questions.yaml
@@ -12,8 +12,8 @@ questions:
 # Include{containerMain}
 # Include{containerBasic}
 # Include{containerAdvanced}
-
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -78,12 +78,12 @@ questions:
                 schema:
                   type: int
                   default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 568
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/hammond/templates/NOTES.txt b/charts/stable/hammond/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/stable/hammond/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/stable/hammond/templates/_secrets.tpl b/charts/stable/hammond/templates/_secrets.tpl
index 42fd44cbec0..9c7aeade076 100644
--- a/charts/stable/hammond/templates/_secrets.tpl
+++ b/charts/stable/hammond/templates/_secrets.tpl
@@ -1,14 +1,9 @@
 {{/* Define the secrets */}}
 {{- define "hammond.secrets" -}}
----
-
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: hammond-secrets
-{{- $hammondprevious := lookup "v1" "Secret" .Release.Namespace "hammond-secrets" }}
+{{- $secretName := printf "%s-secrets" (include "tc.v1.common.lib.chart.names.fullname" .) }}
+{{- $hammondprevious := lookup "v1" "Secret" .Release.Namespace $secretName }}
 {{- $jwt_secret := "" }}
+enabled: true
 data:
   {{- if $hammondprevious}}
   JWT_SECRET: {{ index $hammondprevious.data "JWT_SECRET" }}
diff --git a/charts/stable/hammond/templates/common.yaml b/charts/stable/hammond/templates/common.yaml
index af7ef25789e..f720a35d9f9 100644
--- a/charts/stable/hammond/templates/common.yaml
+++ b/charts/stable/hammond/templates/common.yaml
@@ -1,8 +1,11 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "tc.common.loader.init" . }}
+{{- include "tc.v1.common.loader.init" . }}
 
 {{/* Render secrets for hammond */}}
-{{- include "hammond.secrets" . }}
+{{- $secrets := include "hammond.secrets" . | fromYaml -}}
+{{- if $secrets -}}
+  {{- $_ := set .Values.secret "secrets" $secrets -}}
+{{- end -}}
 
 {{/* Render the templates */}}
-{{ include "tc.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.apply" . }}
diff --git a/charts/stable/hammond/values.yaml b/charts/stable/hammond/values.yaml
index 86807fe38ef..4874cd754ef 100644
--- a/charts/stable/hammond/values.yaml
+++ b/charts/stable/hammond/values.yaml
@@ -2,20 +2,12 @@ image:
   repository: tccr.io/truecharts/hammond
   tag: 1.0.0@sha256:c8df8ddfb95c7b836f5022052ec9ea2c515803d6b3787b7725828a47e5f70b14
   pullPolicy: IfNotPresent
-
-env:
-  JWT_SECRET:
-    secretKeyRef:
-      name: hammond-secrets
-      key: JWT_SECRET
-
 service:
   main:
     ports:
       main:
         port: 10186
         targetPort: 3000
-
 persistence:
   config:
     enabled: true
@@ -23,6 +15,24 @@ persistence:
   assets:
     enabled: true
     mountPath: "/assets"
-
 portal:
-  enabled: true
+  open:
+    enabled: true
+
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              type: tcp
+            readiness:
+              type: tcp
+            startup:
+              type: tcp
+          env:
+            JWT_SECRET:
+              secretKeyRef:
+                name: secrets
+                key: JWT_SECRET
diff --git a/charts/stable/lancache-monolithic/Chart.yaml b/charts/stable/lancache-monolithic/Chart.yaml
index abf62dda410..83076a56676 100644
--- a/charts/stable/lancache-monolithic/Chart.yaml
+++ b/charts/stable/lancache-monolithic/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 kubeVersion: ">=1.16.0-0"
 name: lancache-monolithic
-version: 3.0.11
+version: 4.0.0
 appVersion: "latest"
 description: A monolithic lancache service capable of caching all CDNs in a single instance.
 type: application
@@ -17,7 +17,7 @@ sources:
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.6.1
 maintainers:
   - email: info@truecharts.org
     name: TrueCharts
@@ -26,4 +26,3 @@ annotations:
   truecharts.org/catagories: |
     - gaming
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/stable/lancache-monolithic/questions.yaml b/charts/stable/lancache-monolithic/questions.yaml
index 025e59c9a26..58d792463c5 100644
--- a/charts/stable/lancache-monolithic/questions.yaml
+++ b/charts/stable/lancache-monolithic/questions.yaml
@@ -8,59 +8,61 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
+
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: CACHE_DOMAINS_REPO
+                                        label: "CACHE DOMAINS REPO"
+                                        description: "The github repo url for the cache_domains files to use to populate the cdn maps."
+                                        schema:
+                                          type: string
+                                          default: "https://github.com/uklans/cache-domains.git"
+                                      - variable: CACHE_DOMAINS_BRANCH
+                                        label: "CACHE DOMAINS BRANCH"
+                                        description: "The branch of the CACHE_DOMAINS_REPO to use"
+                                        schema:
+                                          type: string
+                                          default: "master"
+                                      - variable: NOFETCH
+                                        label: "NO FETCH"
+                                        description: "Turn off all git pull operations and use stored data"
+                                        schema:
+                                          type: boolean
+                                          default: false
+                                      - variable: UPSTREAM_DNS
+                                        label: "UPSTREAM DNS"
+                                        description: "Upstream DNS server(s) the cache should use(separated by spaces). Do NOT point this at lancache-dns)"
+                                        schema:
+                                          type: string
+                                          default: "1.1.1.1 1.0.0.1"
+                                      - variable: CACHE_DISK_SIZE
+                                        label: "CACHE DISK SIZE"
+                                        description: "The amount of disk space the container should use for caching data"
+                                        schema:
+                                          type: string
+                                          default: "1000000m"
+                                      - variable: CACHE_MAX_AGE
+                                        label: "CACHE MAX AGE"
+                                        description: "The maximum amount of time a file should be held in cache"
+                                        schema:
+                                          type: string
+                                          default: "3560d"
+                                      - variable: CACHE_INDEX_SIZE
+                                        label: "CACHE INDEX SIZE"
+                                        description: "Amount of index memory for the nginx cache manager. We recommend 250m of index memory per 1TB"
+                                        schema:
+                                          type: string
+                                          default: "500m"
 # Include{containerBasic}
 # Include{containerAdvanced}
-
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: CACHE_DOMAINS_REPO
-          label: "CACHE DOMAINS REPO"
-          description: "The github repo url for the cache_domains files to use to populate the cdn maps."
-          schema:
-            type: string
-            default: "https://github.com/uklans/cache-domains.git"
-        - variable: CACHE_DOMAINS_BRANCH
-          label: "CACHE DOMAINS BRANCH"
-          description: "The branch of the CACHE_DOMAINS_REPO to use"
-          schema:
-            type: string
-            default: "master"
-        - variable: NOFETCH
-          label: "NO FETCH"
-          description: "Turn off all git pull operations and use stored data"
-          schema:
-            type: boolean
-            default: false
-        - variable: UPSTREAM_DNS
-          label: "UPSTREAM DNS"
-          description: "Upstream DNS server(s) the cache should use(separated by spaces). Do NOT point this at lancache-dns)"
-          schema:
-            type: string
-            default: "1.1.1.1 1.0.0.1"
-        - variable: CACHE_DISK_SIZE
-          label: "CACHE DISK SIZE"
-          description: "The amount of disk space the container should use for caching data"
-          schema:
-            type: string
-            default: "1000000m"
-        - variable: CACHE_MAX_AGE
-          label: "CACHE MAX AGE"
-          description: "The maximum amount of time a file should be held in cache"
-          schema:
-            type: string
-            default: "3560d"
-        - variable: CACHE_INDEX_SIZE
-          label: "CACHE INDEX SIZE"
-          description: "Amount of index memory for the nginx cache manager. We recommend 250m of index memory per 1TB"
-          schema:
-            type: string
-            default: "500m"
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -147,12 +149,12 @@ questions:
                 schema:
                   type: int
                   default: 0
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 0
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/lancache-monolithic/templates/NOTES.txt b/charts/stable/lancache-monolithic/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/stable/lancache-monolithic/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/stable/lancache-monolithic/templates/common.yaml b/charts/stable/lancache-monolithic/templates/common.yaml
index c1a366e1cf0..b51394e00a4 100644
--- a/charts/stable/lancache-monolithic/templates/common.yaml
+++ b/charts/stable/lancache-monolithic/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/lancache-monolithic/values.yaml b/charts/stable/lancache-monolithic/values.yaml
index 18b7e69eade..16f9c4aece6 100644
--- a/charts/stable/lancache-monolithic/values.yaml
+++ b/charts/stable/lancache-monolithic/values.yaml
@@ -2,31 +2,13 @@ image:
   repository: tccr.io/truecharts/lancache-monolithic
   pullPolicy: IfNotPresent
   tag: latest@sha256:2a4bc774b45400ef97bf6e4c13262f6c96f78821b3857f86a0c8ccef47c1290d
-
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-env:
-  CACHE_DOMAINS_REPO: "https://github.com/uklans/cache-domains.git"
-  CACHE_DOMAINS_BRANCH: "master"
-  UPSTREAM_DNS: "1.1.1.1 1.0.0.1"
-  CACHE_DISK_SIZE: "1000000m"
-  CACHE_MAX_AGE: "3560d"
-  CACHE_INDEX_SIZE: "500m"
-  NOFETCH: false
-
 service:
   main:
     ports:
       main:
         port: 10279
         targetPort: 80
-        protocol: HTTP
+        protocol: http
   https:
     enabled: true
     ports:
@@ -34,8 +16,7 @@ service:
         enabled: true
         port: 10280
         targetPort: 443
-        protocol: HTTPS
-
+        protocol: https
 persistence:
   config:
     enabled: true
@@ -43,6 +24,32 @@ persistence:
   logs:
     enabled: true
     mountPath: "/data/logs"
-
 portal:
-  enabled: false
+  open:
+    enabled: false
+securityContext:
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              type: tcp
+            readiness:
+              type: tcp
+            startup:
+              type: tcp
+          env:
+            CACHE_DOMAINS_REPO: "https://github.com/uklans/cache-domains.git"
+            CACHE_DOMAINS_BRANCH: "master"
+            UPSTREAM_DNS: "1.1.1.1 1.0.0.1"
+            CACHE_DISK_SIZE: "1000000m"
+            CACHE_MAX_AGE: "3560d"
+            CACHE_INDEX_SIZE: "500m"
+            NOFETCH: false
diff --git a/charts/stable/makemkv/Chart.yaml b/charts/stable/makemkv/Chart.yaml
index 559e56841b9..b1296b7b8d5 100644
--- a/charts/stable/makemkv/Chart.yaml
+++ b/charts/stable/makemkv/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "23.02.5"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.6.1
 description: MakeMKV is your one-click solution to convert video that you own into free and patents-unencumbered format that can be played everywhere.
 home: https://truecharts.org/charts/stable/makemkv
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/makemkv.png
@@ -18,9 +18,8 @@ name: makemkv
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/makemkv
   - https://github.com/jlesage/docker-makemkv
-version: 4.0.15
+version: 5.0.0
 annotations:
   truecharts.org/catagories: |
     - media
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/stable/makemkv/questions.yaml b/charts/stable/makemkv/questions.yaml
index 11266dc8dba..d1c0d044659 100644
--- a/charts/stable/makemkv/questions.yaml
+++ b/charts/stable/makemkv/questions.yaml
@@ -10,23 +10,24 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
+
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: VNC_PASSWORD
+                                        label: "VNC_PASSWORD"
+                                        description: "Password needed to connect to the application's GUI. See the VNC Password section for more details."
+                                        schema:
+                                          type: string
+                                          private: true
+                                          default: ""
 # Include{containerBasic}
 # Include{containerAdvanced}
-
-  - variable: secretEnv
-    group: "App Configuration"
-    label: "Image Secrets"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: VNC_PASSWORD
-          label: "VNC_PASSWORD"
-          description: "Password needed to connect to the application's GUI. See the VNC Password section for more details."
-          schema:
-            type: string
-            private: true
-            default: ""
   - variable: makemkv
     group: "App Configuration"
     label: "MakeMKV Configuration"
@@ -129,7 +130,9 @@ questions:
           schema:
             type: boolean
             default: false
+
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -224,12 +227,12 @@ questions:
                 schema:
                   type: int
                   default: 0
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 0
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/makemkv/templates/NOTES.txt b/charts/stable/makemkv/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/stable/makemkv/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/stable/makemkv/templates/common.yaml b/charts/stable/makemkv/templates/common.yaml
index c1a366e1cf0..b51394e00a4 100644
--- a/charts/stable/makemkv/templates/common.yaml
+++ b/charts/stable/makemkv/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/makemkv/values.yaml b/charts/stable/makemkv/values.yaml
index 0d31a2f16ae..05ec6aff252 100644
--- a/charts/stable/makemkv/values.yaml
+++ b/charts/stable/makemkv/values.yaml
@@ -2,22 +2,6 @@ image:
   repository: tccr.io/truecharts/makemkv
   tag: 23.02.5@sha256:b6d3eab777a35cd117919ede4a74e33cd3586e57760c98aaec349875eb4ae863
   pullPolicy: IfNotPresent
-
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-secretEnv:
-  VNC_PASSWORD: ""
-
-envFrom:
-  - configMapRef:
-      name: '{{ include "tc.common.names.fullname" . }}-makemkv'
-
 makemkv:
   # General Settings
   KEEP_APP_RUNNING: false
@@ -37,7 +21,6 @@ makemkv:
   AUTO_DISC_RIPPER_PARALLEL_RIP: false
   AUTO_DISC_RIPPER_NO_GUI_PROGRESS: false
   AUTO_DISC_RIPPER_FORCE_UNIQUE_OUTPUT_DIR: false
-
 service:
   main:
     ports:
@@ -51,7 +34,6 @@ service:
         enabled: true
         port: 10181
         targetPort: 5900
-
 configmap:
   makemkv:
     enabled: true
@@ -71,7 +53,6 @@ configmap:
       AUTO_DISC_RIPPER_PARALLEL_RIP: '{{ ternary "1" "0" .Values.makemkv.AUTO_DISC_RIPPER_PARALLEL_RIP }}'
       AUTO_DISC_RIPPER_NO_GUI_PROGRESS: '{{ ternary "1" "0" .Values.makemkv.AUTO_DISC_RIPPER_NO_GUI_PROGRESS }}'
       AUTO_DISC_RIPPER_FORCE_UNIQUE_OUTPUT_DIR: '{{ ternary "1" "0" .Values.makemkv.AUTO_DISC_RIPPER_FORCE_UNIQUE_OUTPUT_DIR }}'
-
 persistence:
   config:
     enabled: true
@@ -82,6 +63,34 @@ persistence:
   output:
     enabled: true
     mountPath: "/output"
-
 portal:
-  enabled: true
+  open:
+    enabled: true
+securityContext:
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          securityContext:
+            capabilities:
+              add:
+                - NET_BIND_SERVICE
+                - KILL
+          probes:
+            liveness:
+              type: tcp
+            readiness:
+              type: tcp
+            startup:
+              type: tcp
+          env:
+            VNC_PASSWORD: ""
+          envFrom:
+            - configMapRef:
+                name: "makemkv"
diff --git a/charts/stable/mediainfo/Chart.yaml b/charts/stable/mediainfo/Chart.yaml
index 1e40f74991e..36bccf2f2c6 100644
--- a/charts/stable/mediainfo/Chart.yaml
+++ b/charts/stable/mediainfo/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "23.02.2"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.6.1
 deprecated: false
 description: MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files.
 home: https://truecharts.org/charts/stable/mediainfo
@@ -21,9 +21,8 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/mediainfo
   - https://github.com/jlesage/docker-mediainfo
 type: application
-version: 3.0.14
+version: 4.0.0
 annotations:
   truecharts.org/catagories: |
     - media
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/stable/mediainfo/questions.yaml b/charts/stable/mediainfo/questions.yaml
index 16102c99eb0..66ee31f3aa6 100644
--- a/charts/stable/mediainfo/questions.yaml
+++ b/charts/stable/mediainfo/questions.yaml
@@ -11,23 +11,24 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
+
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: VNC_PASSWORD
+                                        label: "VNC_PASSWORD"
+                                        description: "Password needed to connect to the application's GUI. See the VNC Password section for more details."
+                                        schema:
+                                          type: string
+                                          private: true
+                                          default: ""
 # Include{containerBasic}
 # Include{containerAdvanced}
-
-  - variable: secretEnv
-    group: "App Configuration"
-    label: "Image Secrets"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: VNC_PASSWORD
-          label: "VNC_PASSWORD"
-          description: "Password needed to connect to the application's GUI. See the VNC Password section for more details."
-          schema:
-            type: string
-            private: true
-            default: ""
   - variable: mediainfo
     group: "App Configuration"
     label: "Media Info Configuration"
@@ -75,7 +76,9 @@ questions:
                 schema:
                   type: boolean
                   default: false
+
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -162,12 +165,12 @@ questions:
                 schema:
                   type: int
                   default: 0
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 0
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/mediainfo/templates/NOTES.txt b/charts/stable/mediainfo/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/stable/mediainfo/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/stable/mediainfo/templates/common.yaml b/charts/stable/mediainfo/templates/common.yaml
index c1a366e1cf0..b51394e00a4 100644
--- a/charts/stable/mediainfo/templates/common.yaml
+++ b/charts/stable/mediainfo/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/mediainfo/values.yaml b/charts/stable/mediainfo/values.yaml
index 9bc23047058..1c330229619 100644
--- a/charts/stable/mediainfo/values.yaml
+++ b/charts/stable/mediainfo/values.yaml
@@ -2,15 +2,6 @@ image:
   repository: tccr.io/truecharts/mediainfo
   tag: 23.02.2@sha256:f2b4e4d9d3c908dbc7a2e6235e77ac0bba22ba00c3be06c340442eaada8b3a30
   pullPolicy: IfNotPresent
-
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
 service:
   main:
     ports:
@@ -24,21 +15,12 @@ service:
         enabled: true
         port: 10265
         targetPort: 5900
-
-envFrom:
-  - configMapRef:
-      name: '{{ include "tc.common.names.fullname" . }}-mediainfo'
-
-secretEnv:
-  VNC_PASSWORD: ""
-
 mediainfo:
   KEEP_APP_RUNNING: false
   DISPLAY_WIDTH: 1280
   DISPLAY_HEIGHT: 768
   SECURE_CONNECTION: false
   ENABLE_CJK_FONT: false
-
 configmap:
   mediainfo:
     enabled: true
@@ -48,7 +30,6 @@ configmap:
       SECURE_CONNECTION: '{{ ternary "1" "0" .Values.mediainfo.SECURE_CONNECTION }}'
       DISPLAY_WIDTH: "{{ .Values.mediainfo.DISPLAY_WIDTH }}"
       DISPLAY_HEIGHT: "{{ .Values.mediainfo.DISPLAY_HEIGHT }}"
-
 persistence:
   config:
     enabled: true
@@ -56,6 +37,34 @@ persistence:
   storage:
     enabled: true
     mountPath: "/storage"
-
 portal:
-  enabled: true
+  open:
+    enabled: true
+securityContext:
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          securityContext:
+            capabilities:
+              add:
+                - NET_BIND_SERVICE
+                - KILL
+          probes:
+            liveness:
+              type: tcp
+            readiness:
+              type: tcp
+            startup:
+              type: tcp
+          env:
+            VNC_PASSWORD: ""
+          envFrom:
+            - configMapRef:
+                name: "mediainfo"
diff --git a/charts/stable/mkvtoolnix/Chart.yaml b/charts/stable/mkvtoolnix/Chart.yaml
index f483928af42..9d9f06cbf55 100644
--- a/charts/stable/mkvtoolnix/Chart.yaml
+++ b/charts/stable/mkvtoolnix/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "23.02.5"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.6.1
 deprecated: false
 description: MKVToolNix is a set of tools to create, alter and inspect Matroska files.
 home: https://truecharts.org/charts/stable/mkvtoolnix
@@ -23,9 +23,8 @@ sources:
   - https://github.com/jlesage/docker-mkvtoolnix
   - https://mkvtoolnix.download/
 type: application
-version: 4.0.16
+version: 5.0.0
 annotations:
   truecharts.org/catagories: |
     - media
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/stable/mkvtoolnix/questions.yaml b/charts/stable/mkvtoolnix/questions.yaml
index 8269aed70f6..afd8a506589 100644
--- a/charts/stable/mkvtoolnix/questions.yaml
+++ b/charts/stable/mkvtoolnix/questions.yaml
@@ -11,23 +11,24 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
+
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: VNC_PASSWORD
+                                        label: "VNC_PASSWORD"
+                                        description: "Password needed to connect to the application's GUI. See the VNC Password section for more details."
+                                        schema:
+                                          type: string
+                                          private: true
+                                          default: ""
 # Include{containerBasic}
 # Include{containerAdvanced}
-
-  - variable: secretEnv
-    group: "App Configuration"
-    label: "Image Secrets"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: VNC_PASSWORD
-          label: "VNC_PASSWORD"
-          description: "Password needed to connect to the application's GUI. See the VNC Password section for more details."
-          schema:
-            type: string
-            private: true
-            default: ""
   - variable: mkvtoolnix
     group: "App Configuration"
     label: "MKVToolNix Configuration"
@@ -82,6 +83,7 @@ questions:
                   type: boolean
                   default: false
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -168,12 +170,12 @@ questions:
                 schema:
                   type: int
                   default: 0
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 0
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/mkvtoolnix/templates/NOTES.txt b/charts/stable/mkvtoolnix/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/stable/mkvtoolnix/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/stable/mkvtoolnix/templates/common.yaml b/charts/stable/mkvtoolnix/templates/common.yaml
index c1a366e1cf0..b51394e00a4 100644
--- a/charts/stable/mkvtoolnix/templates/common.yaml
+++ b/charts/stable/mkvtoolnix/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/mkvtoolnix/values.yaml b/charts/stable/mkvtoolnix/values.yaml
index 4e99e08cdec..6a181c3325f 100644
--- a/charts/stable/mkvtoolnix/values.yaml
+++ b/charts/stable/mkvtoolnix/values.yaml
@@ -2,15 +2,6 @@ image:
   repository: tccr.io/truecharts/mkvtoolnix
   tag: 23.02.5@sha256:2b0919d180998713a6c1f1cc2cea53d60b58e3d21d824c5bf2bb3325432ebe4e
   pullPolicy: IfNotPresent
-
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
 service:
   main:
     ports:
@@ -24,14 +15,6 @@ service:
         enabled: true
         port: 10237
         targetPort: 5900
-
-envFrom:
-  - configMapRef:
-      name: '{{ include "tc.common.names.fullname" . }}-mkvtoolnix'
-
-secretEnv:
-  VNC_PASSWORD: ""
-
 mkvtoolnix:
   # General Settings
   KEEP_APP_RUNNING: false
@@ -42,7 +25,6 @@ mkvtoolnix:
   # App Settings
   SECURE_CONNECTION: false
   ENABLE_CJK_FONT: false
-
 configmap:
   mkvtoolnix:
     enabled: true
@@ -53,7 +35,6 @@ configmap:
       DISPLAY_WIDTH: "{{ .Values.mkvtoolnix.DISPLAY_WIDTH }}"
       DISPLAY_HEIGHT: "{{ .Values.mkvtoolnix.DISPLAY_HEIGHT }}"
       DARK_MODE: '{{ ternary "1" "0" .Values.mkvtoolnix.DARK_MODE }}'
-
 persistence:
   config:
     enabled: true
@@ -61,6 +42,34 @@ persistence:
   storage:
     enabled: true
     mountPath: "/storage"
-
 portal:
-  enabled: true
+  open:
+    enabled: true
+securityContext:
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          securityContext:
+            capabilities:
+              add:
+                - NET_BIND_SERVICE
+                - KILL
+          probes:
+            liveness:
+              type: tcp
+            readiness:
+              type: tcp
+            startup:
+              type: tcp
+          env:
+            VNC_PASSWORD: ""
+          envFrom:
+            - configMapRef:
+                name: "mkvtoolnix"
diff --git a/charts/stable/nocodb/Chart.yaml b/charts/stable/nocodb/Chart.yaml
index f0c424e9c11..ba35294eb95 100644
--- a/charts/stable/nocodb/Chart.yaml
+++ b/charts/stable/nocodb/Chart.yaml
@@ -3,15 +3,12 @@ appVersion: "0.105.3"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
-  - condition: postgresql.enabled
-    name: postgresql
-    repository: https://deps.truecharts.org/
-    version: 11.0.31
+    version: 12.6.1
+
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 5.0.33
+    version: 6.0.21
 description: Turns any MySQL, PostgreSQL, SQL Server, SQLite & MariaDB into a smart-spreadsheet.
 home: https://truecharts.org/charts/stable/nocodb
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/nocodb.png
@@ -26,9 +23,8 @@ name: nocodb
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/nocodb
   - https://github.com/nocodb/nocodb
-version: 6.0.34
+version: 7.0.0
 annotations:
   truecharts.org/catagories: |
     - productivity
   truecharts.org/SCALE-support: "true"
-  truecharts.org/grade: U
diff --git a/charts/stable/nocodb/LICENSE b/charts/stable/nocodb/LICENSE
new file mode 100644
index 00000000000..33a8cbb23f0
--- /dev/null
+++ b/charts/stable/nocodb/LICENSE
@@ -0,0 +1,106 @@
+Business Source License 1.1
+
+Parameters
+
+Licensor:             The TrueCharts Project, it's owner and it's contributors
+Licensed Work:        The TrueCharts "Blocky" Helm Chart
+Additional Use Grant: You may use the licensed work in production, as long
+                      as it is directly sourced from a TrueCharts provided
+                      official repository, catalog or source. You may also make private
+                      modification to the directly sourced licenced work,
+                      when used in production.
+
+                      The following cases are, due to their nature, also
+                      defined as 'production use' and explicitly prohibited:
+                      - Bundling, including or displaying the licensed work
+                      with(in) another work intended for production use,
+                      with the apparent intend of facilitating and/or
+                      promoting production use by third parties in
+                      violation of this license.
+
+Change Date:          2050-01-01
+
+Change License:       3-clause BSD license
+
+For information about alternative licensing arrangements for the Software,
+please contact: legal@truecharts.org
+
+Notice
+
+The Business Source License (this document, or the “License”) is not an Open
+Source license. However, the Licensed Work will eventually be made available
+under an Open Source License, as stated in this License.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
+“Business Source License” is a trademark of MariaDB Corporation Ab.
+
+-----------------------------------------------------------------------------
+
+Business Source License 1.1
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited
+production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license
+your works, and to refer to it using the trademark “Business Source License”,
+as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+
+In consideration of the right to use this License’s text and the “Business
+Source License” name and trademark, Licensor covenants to MariaDB, and to all
+other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version,
+   or a license that is compatible with GPL Version 2.0 or a later version,
+   where “compatible” means that software provided under the Change License can
+   be included in a program with software provided under GPL Version 2.0 or a
+   later version. Licensor may specify additional Change Licenses without
+   limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not
+   impose any additional restriction on the right granted in this License, as
+   the Additional Use Grant; or (b) insert the text “None”.
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.
diff --git a/charts/stable/nocodb/questions.yaml b/charts/stable/nocodb/questions.yaml
index be2c4d63f8f..69c2accbd54 100644
--- a/charts/stable/nocodb/questions.yaml
+++ b/charts/stable/nocodb/questions.yaml
@@ -11,122 +11,115 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: AWS_ACCESS_KEY_ID
+                                        label: "AWS Access Key ID"
+                                        description: "For Litestream - S3 access key id."
+                                        schema:
+                                          type: string
+                                          private: true
+                                          default: ""
+                                      - variable: AWS_SECRET_ACCESS_KEY
+                                        label: "AWS Secret Access Key"
+                                        description: For Litestream - S3 secret access key."
+                                        schema:
+                                          type: string
+                                          private: true
+                                          default: ""
+                                      - variable: AWS_BUCKET
+                                        label: "AWS Bucket"
+                                        description: "For Litestream - S3 bucket."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: AWS_BUCKET_PATH
+                                        label: "AWS Bucket Path"
+                                        description: "For Litestream - S3 bucket path (like folder within S3 bucket)."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: NC_GOOGLE_CLIENT_ID
+                                        label: "Google Client ID"
+                                        description: "Google client id to enable google authentication."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: NC_GOOGLE_CLIENT_SECRET
+                                        label: "Google Client Secret"
+                                        description: "Google client secret to enable google authentication."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: NC_PUBLIC_URL
+                                        label: "Public URL"
+                                        description: "Used for sending Email invitations."
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: NC_JWT_EXPIRES_IN
+                                        label: "JWT Expires in"
+                                        description: "JWT token expiry time."
+                                        schema:
+                                          type: string
+                                          default: "10h"
+                                      - variable: DISABLE_SPLASH_SCREEN
+                                        label: "Disable Splash Screen"
+                                        description: "Disables the default splash screen(initial welcome animation) and matrix screensaver will disable."
+                                        schema:
+                                          type: boolean
+                                          default: false
+                                      - variable: NC_INVITE_ONLY_SIGNUP
+                                        label: "Invite Only Signup"
+                                        description: "Allow users to signup only via invite url, value should be any non-empty string."
+                                        schema:
+                                          type: boolean
+                                          default: false
+                                      - variable: NC_DISABLE_CACHE
+                                        label: "Disable Cache"
+                                        description: "If it is set to true, then meta data will not be cached."
+                                        schema:
+                                          type: boolean
+                                          default: false
+                                      - variable: NC_DISABLE_TELE
+                                        label: "Disable Telemetry"
+                                        description: "Disable telemetry."
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                      - variable: NC_DISABLE_ERR_REPORT
+                                        label: "Disable Error Report"
+                                        description: "Disable Error Reporting."
+                                        schema:
+                                          type: boolean
+                                          default: true
+                                      - variable: NC_REQUEST_BODY_SIZE
+                                        label: "Request Body Size"
+                                        description: "Request body size limit."
+                                        schema:
+                                          type: string
+                                          default: "1MB"
+                                      - variable: NC_EXPORT_MAX_TIMEOUT
+                                        label: "Export Max Timeout"
+                                        description: "After timeout, csv gets downloaded in batches."
+                                        schema:
+                                          type: int
+                                          default: 5000
+                                      - variable: NC_SENTRY_DSN
+                                        label: "Sentry DSN"
+                                        description: "For Sentry monitoring."
+                                        schema:
+                                          type: string
+                                          default: ""
 # Include{containerBasic}
 # Include{containerAdvanced}
-
-  - variable: secretEnv
-    group: "App Configuration"
-    label: "Image Secrets"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: AWS_ACCESS_KEY_ID
-          label: "AWS Access Key ID"
-          description: "For Litestream - S3 access key id."
-          schema:
-            type: string
-            private: true
-            default: ""
-        - variable: AWS_SECRET_ACCESS_KEY
-          label: "AWS Secret Access Key"
-          description: For Litestream - S3 secret access key."
-          schema:
-            type: string
-            private: true
-            default: ""
-        - variable: AWS_BUCKET
-          label: "AWS Bucket"
-          description: "For Litestream - S3 bucket."
-          schema:
-            type: string
-            default: ""
-        - variable: AWS_BUCKET_PATH
-          label: "AWS Bucket Path"
-          description: "For Litestream - S3 bucket path (like folder within S3 bucket)."
-          schema:
-            type: string
-            default: ""
-        - variable: NC_GOOGLE_CLIENT_ID
-          label: "Google Client ID"
-          description: "Google client id to enable google authentication."
-          schema:
-            type: string
-            default: ""
-        - variable: NC_GOOGLE_CLIENT_SECRET
-          label: "Google Client Secret"
-          description: "Google client secret to enable google authentication."
-          schema:
-            type: string
-            default: ""
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: NC_PUBLIC_URL
-          label: "Public URL"
-          description: "Used for sending Email invitations."
-          schema:
-            type: string
-            default: ""
-        - variable: NC_JWT_EXPIRES_IN
-          label: "JWT Expires in"
-          description: "JWT token expiry time."
-          schema:
-            type: string
-            default: "10h"
-        - variable: DISABLE_SPLASH_SCREEN
-          label: "Disable Splash Screen"
-          description: "Disables the default splash screen(initial welcome animation) and matrix screensaver will disable."
-          schema:
-            type: boolean
-            default: false
-        - variable: NC_INVITE_ONLY_SIGNUP
-          label: "Invite Only Signup"
-          description: "Allow users to signup only via invite url, value should be any non-empty string."
-          schema:
-            type: boolean
-            default: false
-        - variable: NC_DISABLE_CACHE
-          label: "Disable Cache"
-          description: "If it is set to true, then meta data will not be cached."
-          schema:
-            type: boolean
-            default: false
-        - variable: NC_DISABLE_TELE
-          label: "Disable Telemetry"
-          description: "Disable telemetry."
-          schema:
-            type: boolean
-            default: true
-        - variable: NC_DISABLE_ERR_REPORT
-          label: "Disable Error Report"
-          description: "Disable Error Reporting."
-          schema:
-            type: boolean
-            default: true
-        - variable: NC_REQUEST_BODY_SIZE
-          label: "Request Body Size"
-          description: "Request body size limit."
-          schema:
-            type: string
-            default: "1MB"
-        - variable: NC_EXPORT_MAX_TIMEOUT
-          label: "Export Max Timeout"
-          description: "After timeout, csv gets downloaded in batches."
-          schema:
-            type: int
-            default: 5000
-        - variable: NC_SENTRY_DSN
-          label: "Sentry DSN"
-          description: "For Sentry monitoring."
-          schema:
-            type: string
-            default: ""
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
           label: "Main Service"
@@ -183,12 +176,12 @@ questions:
                 schema:
                   type: int
                   default: 0
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 0
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 0
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/nocodb/templates/NOTES.txt b/charts/stable/nocodb/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/stable/nocodb/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/stable/nocodb/templates/_configmap.tpl b/charts/stable/nocodb/templates/_configmap.tpl
index 37f485acfab..806fe67fc04 100644
--- a/charts/stable/nocodb/templates/_configmap.tpl
+++ b/charts/stable/nocodb/templates/_configmap.tpl
@@ -1,14 +1,12 @@
+{{/* Define the configmap */}}
 {{- define "nocodb.configmap" -}}
 
-{{- $pgPass := .Values.postgresql.postgresqlPassword | trimAll "\"" }}
-{{- $pgUser := .Values.postgresql.postgresqlUsername }}
-{{- $pgDB := .Values.postgresql.postgresqlDatabase }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nocodb-configmap
+{{- $pgPass := .Values.cnpg.main.creds.password | trimAll "\"" }}
+{{- $pgUser := .Values.cnpg.main.user }}
+{{- $pgDB := .Values.cnpg.main.database }}
+{{- $pgHost := printf "%v-cnpg-main-rw" (include "tc.v1.common.lib.chart.names.fullname" $) }}
+enabled: true
 data:
-  NC_DB: "{{ printf "pg://%v-postgresql:5432?u=%v&p=%v&d=%v" .Release.Name $pgUser $pgPass $pgDB }}"
-  NC_MIN: "{{ ternary "true" "" .Values.env.DISABLE_SPLASH_SCREEN }}"
+  NC_DB: "{{ printf "pg://%v:5432?u=%v&p=%v&d=%v" $pgHost $pgUser $pgPass $pgDB }}"
+  NC_MIN: "{{ ternary "true" "" .Values.workload.main.podSpec.containers.main.env.DISABLE_SPLASH_SCREEN }}"
 {{- end -}}
diff --git a/charts/stable/nocodb/templates/_secrets.tpl b/charts/stable/nocodb/templates/_secrets.tpl
index fa77fcdcbdf..dd398c7be58 100644
--- a/charts/stable/nocodb/templates/_secrets.tpl
+++ b/charts/stable/nocodb/templates/_secrets.tpl
@@ -1,20 +1,14 @@
 {{/* Define the secrets */}}
 {{- define "nocodb.secrets" -}}
----
-
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: nocodb-secrets
 {{- $nocodbprevious := lookup "v1" "Secret" .Release.Namespace "nocodb-secrets" }}
 {{- $auth_jwt_token := "" }}
+enabled: true
 data:
   {{- if $nocodbprevious}}
-  NC_AUTH_JWT_SECRET: {{ index $nocodbprevious.data "NC_AUTH_JWT_SECRET" }}
+  NC_AUTH_JWT_SECRET: {{ index $nocodbprevious.data "NC_AUTH_JWT_SECRET" | b64dec }}
   {{- else }}
-  {{- $auth_jwt_token := randAlphaNum 32 }}
-  NC_AUTH_JWT_SECRET: {{ $auth_jwt_token | b64enc }}
+    {{- $auth_jwt_token := randAlphaNum 32 }}
+  NC_AUTH_JWT_SECRET: {{ $auth_jwt_token }}
   {{- end }}
 
 {{- end -}}
diff --git a/charts/stable/nocodb/templates/common.yaml b/charts/stable/nocodb/templates/common.yaml
index 0d02f605455..eb374fc46b2 100644
--- a/charts/stable/nocodb/templates/common.yaml
+++ b/charts/stable/nocodb/templates/common.yaml
@@ -1,11 +1,17 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "tc.common.loader.init" . }}
+{{- include "tc.v1.common.loader.init" . }}
 
 {{/* Render configmap for nocodb */}}
-{{- include "nocodb.configmap" . }}
+{{- $configmap := include "nocodb.configmap" . | fromYaml -}}
+{{- if $configmap -}}
+  {{- $_ := set .Values.configmap "configmap" $configmap -}}
+{{- end -}}
 
-{{/* Render secrets for nocodb */}}
-{{- include "nocodb.secrets" . }}
+{{/* Render secret for nocodb */}}
+{{- $secret := include "nocodb.secrets" . | fromYaml -}}
+{{- if $secret -}}
+  {{- $_ := set .Values.secret "secrets" $secret -}}
+{{- end -}}
 
 {{/* Render the templates */}}
-{{ include "tc.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.apply" . }}
diff --git a/charts/stable/nocodb/values.yaml b/charts/stable/nocodb/values.yaml
index 7f2ad28df03..224e5c4666f 100644
--- a/charts/stable/nocodb/values.yaml
+++ b/charts/stable/nocodb/values.yaml
@@ -2,78 +2,73 @@ image:
   repository: tccr.io/truecharts/nocodb
   tag: 0.105.3@sha256:cb70326f19d1d89688f61e70c383553cfaac62e24904f881268a5036609a694d
   pullPolicy: IfNotPresent
-
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-secretEnv:
-AWS_ACCESS_KEY_ID: ""
-AWS_SECRET_ACCESS_KEY: ""
-AWS_BUCKET: ""
-AWS_BUCKET_PATH: ""
-NC_GOOGLE_CLIENT_ID: ""
-NC_GOOGLE_CLIENT_SECRET: ""
-
-env:
-  NC_MIN: ""
-  PORT: "{{ .Values.service.main.ports.main.port }}"
-  # User Defined
-  NC_PUBLIC_URL: "http://localhost:10226"
-  NC_DISABLE_TELE: true
-  DISABLE_SPLASH_SCREEN: false
-  NC_JWT_EXPIRES_IN: "10h"
-  NC_INVITE_ONLY_SIGNUP: false
-  NC_DISABLE_CACHE: false
-  NC_DISABLE_ERR_REPORT: true
-  NC_REQUEST_BODY_SIZE: "1MB"
-  NC_EXPORT_MAX_TIMEOUT: 5000
-  NC_SENTRY_DSN: ""
-  NC_REDIS_URL:
-    secretKeyRef:
-      name: rediscreds
-      key: url
-  NC_AUTH_JWT_SECRET:
-    secretKeyRef:
-      name: nocodb-secrets
-      key: NC_AUTH_JWT_SECRET
-
-envFrom:
-  - configMapRef:
-      name: nocodb-configmap
-
-probes:
-  liveness:
-    path: "/dashboard"
-  readiness:
-    path: "/dashboard"
-  startup:
-    path: "/dashboard"
-
 service:
   main:
     ports:
       main:
         port: 10226
-
 persistence:
   data:
     enabled: true
     mountPath: "/usr/app/data"
+cnpg:
+  main:
+    enabled: true
 
-postgresql:
-  enabled: true
-  existingSecret: "dbcreds"
-  postgresqlUsername: nocodb
-  postgresqlDatabase: nocodb
-
+    user: nocodb
+    database: nocodb
 redis:
   enabled: true
-  existingSecret: "rediscreds"
 
 portal:
-  enabled: true
+  open:
+    enabled: true
+securityContext:
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              path: "/dashboard"
+            readiness:
+              path: "/dashboard"
+            startup:
+              path: "/dashboard"
+          envFrom:
+            - configMapRef:
+                name: configmap
+          env:
+            PORT: "{{ .Values.service.main.ports.main.port }}"
+            # User Defined
+            NC_PUBLIC_URL: "http://localhost:10226"
+            NC_DISABLE_TELE: true
+            DISABLE_SPLASH_SCREEN: false
+            NC_JWT_EXPIRES_IN: "10h"
+            NC_INVITE_ONLY_SIGNUP: false
+            NC_DISABLE_CACHE: false
+            NC_DISABLE_ERR_REPORT: true
+            NC_REQUEST_BODY_SIZE: "1MB"
+            NC_EXPORT_MAX_TIMEOUT: 5000
+            NC_SENTRY_DSN: ""
+            NC_REDIS_URL:
+              secretKeyRef:
+                expandObjectName: false
+                name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}'
+                key: url
+            NC_AUTH_JWT_SECRET:
+              secretKeyRef:
+                name: secrets
+                key: NC_AUTH_JWT_SECRET
+            AWS_ACCESS_KEY_ID: ""
+            AWS_SECRET_ACCESS_KEY: ""
+            AWS_BUCKET: ""
+            AWS_BUCKET_PATH: ""
+            NC_GOOGLE_CLIENT_ID: ""
+            NC_GOOGLE_CLIENT_SECRET: ""