diff --git a/charts/stable/teamspeak3/Chart.yaml b/charts/stable/teamspeak3/Chart.yaml
index 8e5e5b7a08b..81a47133c34 100644
--- a/charts/stable/teamspeak3/Chart.yaml
+++ b/charts/stable/teamspeak3/Chart.yaml
@@ -36,4 +36,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/teamspeak3
   - https://hub.docker.com/_/teamspeak
 type: application
-version: 10.2.0
+version: 10.2.1
diff --git a/charts/stable/teamspeak3/questions.yaml b/charts/stable/teamspeak3/questions.yaml
index 8b5ba056e4d..ac49063f4ac 100644
--- a/charts/stable/teamspeak3/questions.yaml
+++ b/charts/stable/teamspeak3/questions.yaml
@@ -13,8 +13,8 @@ questions:
 # Include{podOptions}
 # Include{serviceRoot}
         - variable: main
-          label: "Server Query Service"
-          description: "The server query service of teamspeak3"
+          label: "Server Query Service RAW"
+          description: "The server query (RAW) service of teamspeak3"
           schema:
             additional_attrs: true
             type: dict
@@ -22,7 +22,7 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: "Server Query Service Port Configuration"
+                      label: "Server Query (RAW) Service Port Configuration"
                       schema:
                         additional_attrs: true
                         type: dict
@@ -34,6 +34,29 @@ questions:
                               type: int
                               default: 10011
                               required: true
+        - variable: query
+          label: "Server Query Service SSH"
+          description: "The server query (SSH) service of teamspeak3"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelectorLoadBalancer}
+# Include{serviceSelectorExtras}
+                    - variable: query
+                      label: "Server Query (SSH) 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: 10022
+                              required: true
+
         - variable: voice
           label: "Voice Service"
           description: "The voice service of teamspeak3"
diff --git a/charts/stable/teamspeak3/values.yaml b/charts/stable/teamspeak3/values.yaml
index edde701720b..552560569a6 100644
--- a/charts/stable/teamspeak3/values.yaml
+++ b/charts/stable/teamspeak3/values.yaml
@@ -28,6 +28,11 @@ service:
       main:
         port: 10011
         targetPort: 10011
+  query:
+    ports:
+      main:
+        port: 10022
+        targetPort: 10022
   voice:
     enabled: true
     ports: