diff --git a/charts/incubator/speedtest-tracker/Chart.yaml b/charts/incubator/speedtest-tracker/Chart.yaml
index 7dce405e1ea..d7f95354ebb 100644
--- a/charts/incubator/speedtest-tracker/Chart.yaml
+++ b/charts/incubator/speedtest-tracker/Chart.yaml
@@ -3,11 +3,7 @@ appVersion: "latest"
 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
 description: A self-hosted internet performance tracking application that runs speedtest checks against Ookla's Speedtest service.
 home: https://truecharts.org/charts/incubator/speedtest-tracker
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/speedtest-tracker.png
@@ -22,7 +18,7 @@ name: speedtest-tracker
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/speedtest-tracker
   - https://github.com/alexjustesen/speedtest-tracker
-version: 3.0.31
+version: 4.0.0
 annotations:
   truecharts.org/catagories: |
     - speedtest
diff --git a/charts/incubator/speedtest-tracker/questions.yaml b/charts/incubator/speedtest-tracker/questions.yaml
index b0dbf97e741..c6637fc3260 100644
--- a/charts/incubator/speedtest-tracker/questions.yaml
+++ b/charts/incubator/speedtest-tracker/questions.yaml
@@ -6,18 +6,17 @@ questions:
 # Include{global}
 # Include{workload}
 # Include{workloadDeployment}
-
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
 # Include{containerBasic}
 # Include{containerAdvanced}
-
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
         - variable: main
-          label: Main Service
-          description: The Primary service on which the healthcheck runs, often the webUI
+          label: "Main Service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
           schema:
             additional_attrs: true
             type: dict
@@ -25,14 +24,14 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: Main Service Port Configuration
+                      label: "Main Service Port Configuration"
                       schema:
                         additional_attrs: true
                         type: dict
                         attrs:
                           - variable: port
-                            label: Port
-                            description: This port exposes the container port on the service
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
                             schema:
                               type: int
                               default: 8765
@@ -43,8 +42,8 @@ questions:
 # Include{serviceList}
 # Include{persistenceRoot}
         - variable: config
-          label: App Config Storage
-          description: Stores the Application Configuration.
+          label: "App Config Storage"
+          description: "Stores the Application Configuration."
           schema:
             additional_attrs: true
             type: dict
@@ -53,7 +52,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: Main Ingress
+          label: "Main Ingress"
           schema:
             additional_attrs: true
             type: dict
@@ -62,30 +61,28 @@ questions:
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressList}
-
-# Include{podSecurityContextRoot}
-        - variable: runAsUser
-          label: runAsUser
-          description: The UserID of the user running the application
-          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
+# Include{securityContextRoot}
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
+                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
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
-        - variable: fsGroup
-          label: fsGroup
-          description: The group that should own ALL storage.
-          schema:
-            type: int
-            default: 568
-
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
+                schema:
+                  type: int
+                  default: 568
 # Include{resources}
 # Include{advanced}
 # Include{addons}
diff --git a/charts/incubator/speedtest-tracker/templates/NOTES.txt b/charts/incubator/speedtest-tracker/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/speedtest-tracker/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/speedtest-tracker/templates/common.yaml b/charts/incubator/speedtest-tracker/templates/common.yaml
index c1a366e1cf0..b51394e00a4 100644
--- a/charts/incubator/speedtest-tracker/templates/common.yaml
+++ b/charts/incubator/speedtest-tracker/templates/common.yaml
@@ -1 +1 @@
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/speedtest-tracker/values.yaml b/charts/incubator/speedtest-tracker/values.yaml
index e2454e66a66..2bbfd2c4aed 100644
--- a/charts/incubator/speedtest-tracker/values.yaml
+++ b/charts/incubator/speedtest-tracker/values.yaml
@@ -4,45 +4,51 @@ image:
   pullPolicy: IfNotPresent
 
 securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-
-podSecurityContext:
-  runAsUser: 0
-  runAsGroup: 0
-
-env:
-  DB_CONNECTION: pgsql
-  DB_PORT: 5432
-  DB_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}"
-  DB_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}"
-  DB_HOST:
-    secretKeyRef:
-      name: dbcreds
-      key: plainhost
-  DB_PASSWORD:
-    secretKeyRef:
-      name: dbcreds
-      key: postgresql-password
+  container:
+    readOnlyRootFilesystem: false
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
 
 service:
   main:
     ports:
       main:
         port: 8765
-        protocol: HTTPS
+        protocol: https
         targetPort: 443
 
+workload:
+  main:
+    enabled: true
+    primary: true
+    podSpec:
+      containers:
+        env:
+          DB_CONNECTION: pgsql
+          DB_PORT: 5432
+          DB_DATABASE: "{{ .Values.cnpg.main.database }}"
+          DB_USERNAME: "{{ .Values.cnpg.main.user }}"
+          DB_HOST:
+            secretKeyRef:
+              name: cnpg-main-urls
+              key: std
+          DB_PASSWORD:
+            secretKeyRef:
+              name: cnpg-main-user
+              key: password
+
 persistence:
   config:
     enabled: true
     mountPath: /config
 
-postgresql:
-  enabled: true
-  existingSecret: dbcreds
-  postgresqlDatabase: speedtest_tracker
-  postgresqlUsername: speedtest_tracker
+cnpg:
+  main:
+    enabled: true
+    user: speedtest_tracker
+    database: speedtest_tracker
 
 portal:
-  enabled: true
+  open:
+    enabled: true