diff --git a/charts/incubator/mosquitto/Chart.yaml b/charts/incubator/mosquitto/Chart.yaml
index 2d2f2d58755..2086736d01a 100644
--- a/charts/incubator/mosquitto/Chart.yaml
+++ b/charts/incubator/mosquitto/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "2.0.15"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 12.10.4
 deprecated: false
 description: Eclipse Mosquitto - An open source MQTT broker
 home: https://truecharts.org/charts/incubator/mosquitto
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/mosquitto
   - https://github.com/eclipse/mosquitto
 type: application
-version: 9.0.0
+version: 10.0.0
 annotations:
   truecharts.org/catagories: |
     - homeautomation
diff --git a/charts/incubator/mosquitto/templates/NOTES.txt b/charts/incubator/mosquitto/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/mosquitto/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/mosquitto/templates/common.yaml b/charts/incubator/mosquitto/templates/common.yaml
index b9e7208f382..995efb03eb0 100644
--- a/charts/incubator/mosquitto/templates/common.yaml
+++ b/charts/incubator/mosquitto/templates/common.yaml
@@ -1,5 +1,5 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "tc.common.loader.init" . }}
+{{- include "tc.v1.common.loader.init" . }}
 
 {{/* Render the templates */}}
-{{ include "tc.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.apply" . }}
diff --git a/charts/incubator/mosquitto/values.yaml b/charts/incubator/mosquitto/values.yaml
index 17fd9f2245d..f5c7fb4ceec 100644
--- a/charts/incubator/mosquitto/values.yaml
+++ b/charts/incubator/mosquitto/values.yaml
@@ -17,6 +17,25 @@ service:
         port: 9001
         targetPort: 9001
 
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              enabled: true
+              type: tcp
+              port: 1883
+            readiness:
+              enabled: true
+              type: tcp
+              port: 1883
+            startup:
+              enabled: true
+              type: tcp
+              port: 1883
+
 ingress:
   websockets:
     autoLink: true
@@ -61,13 +80,12 @@ persistence:
     enabled: true
     mountPath: "/mosquitto/configinc"
   mosquitto-config:
-    enabled: "true"
+    enabled: true
     mountPath: "/mosquitto/config/mosquitto.conf"
     subPath: "mosquitto.conf"
-    type: "custom"
-    volumeSpec:
-      configMap:
-        name: '{{ template "tc.common.names.fullname" . }}-config'
+    type: configmap
+    objectName: config
 
 portal:
-  enabled: false
+  open:
+    enabled: false