diff --git a/teamspeak/chart/teamspeak/templates/query-service.yaml b/teamspeak/chart/teamspeak/templates/query-service.yaml
new file mode 100644
index 0000000..9c46437
--- /dev/null
+++ b/teamspeak/chart/teamspeak/templates/query-service.yaml
@@ -0,0 +1,22 @@
+{{- if .Values.service.queryPort }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-query
+  labels:
+    app: teamspeak
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: ClusterIP
+  ports:
+    - nodePort: {{ .Values.service.queryPort }}
+      targetPort: 10011
+      protocol: TCP
+      name: teamspeak-query
+      port: 10011
+  selector:
+    app: teamspeak
+    release: {{ .Release.Name }}
+{{- end }}
diff --git a/teamspeak/chart/teamspeak/values.yaml b/teamspeak/chart/teamspeak/values.yaml
index 540fd00..3980196 100644
--- a/teamspeak/chart/teamspeak/values.yaml
+++ b/teamspeak/chart/teamspeak/values.yaml
@@ -9,6 +9,7 @@ service:
   type: NodePort
   voicePort: 30987
   filePort: 30033
+  queryPort: 10011
 
 nodeSelector:
   teamspeak: "1"