diff --git a/charts/stable/mosquitto/Chart.yaml b/charts/stable/mosquitto/Chart.yaml
index 30e67a8648f..1bbbdae5983 100644
--- a/charts/stable/mosquitto/Chart.yaml
+++ b/charts/stable/mosquitto/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/mosquitto
   - https://github.com/eclipse/mosquitto
 type: application
-version: 6.0.38
+version: 6.1.0
 annotations:
   truecharts.org/catagories: |
     - homeautomation
diff --git a/charts/stable/mosquitto/questions.yaml b/charts/stable/mosquitto/questions.yaml
index 3610cfbcac7..bcf31903ef9 100644
--- a/charts/stable/mosquitto/questions.yaml
+++ b/charts/stable/mosquitto/questions.yaml
@@ -23,6 +23,19 @@ questions:
           schema:
             type: boolean
             default: false
+  - variable: websockets
+    group: "App Configuration"
+    label: "Web Sockets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: enabled
+          label: "enabled"
+          description: "By enabling this, an additional listener with protocol websockets is added in the mosquitto config."
+          schema:
+            type: boolean
+            default: false
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
@@ -54,6 +67,35 @@ questions:
                                   schema:
                                     type: int
                                     default: 1883
+        - variable: websockets
+          label: "WebSockets Service"
+          description: "WebSockets Service"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelectorClusterIP}
+# Include{serviceSelectorExtras}
+                    - variable: websockets
+                      label: "WebSockets Service Port Configuration"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 9001
+                              required: true
+# Include{advancedPortHTTP}
+                                - variable: targetPort
+                                  label: "Target Port"
+                                  description: "The internal(!) port on the container the Application runs on"
+                                  schema:
+                                    type: int
+                                    default: 9001
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
diff --git a/charts/stable/mosquitto/values.yaml b/charts/stable/mosquitto/values.yaml
index bde431faf81..17a42abadbd 100644
--- a/charts/stable/mosquitto/values.yaml
+++ b/charts/stable/mosquitto/values.yaml
@@ -9,17 +9,32 @@ service:
       main:
         port: 1883
         targetPort: 1883
+  websockets:
+    enabled: true
+    ports:
+      websockets:
+        enabled: true
+        port: 9001
+        targetPort: 9001
 
 auth:
   # -- By enabling this, `allow_anonymous` gets set to `false` in the mosquitto config.
   enabled: false
 
+websockets:
+  # -- By enabling this, an additional listener with protocol websockets is added in the mosquitto config.
+  enabled: false
+
 configmap:
   config:
     enabled: true
     data:
       mosquitto.conf: |
         listener {{ .Values.service.main.ports.main.port }}
+        {{- if .Values.websockets.enabled }}
+        listener {{ .Values.service.websockets.ports.websockets.targetPort }}
+        protocol websockets
+        {{- end }}
         {{- if .Values.auth.enabled }}
         allow_anonymous false
         {{- else }}