diff --git a/charts/incubator/teamspeak3/CHANGELOG.md b/charts/incubator/teamspeak3/CHANGELOG.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/charts/incubator/teamspeak3/CONFIG.md b/charts/incubator/teamspeak3/CONFIG.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/charts/incubator/teamspeak3/Chart.yaml b/charts/incubator/teamspeak3/Chart.yaml
new file mode 100644
index 00000000000..3228c4927de
--- /dev/null
+++ b/charts/incubator/teamspeak3/Chart.yaml
@@ -0,0 +1,26 @@
+apiVersion: v2
+appVersion: "3.13.6"
+dependencies:
+- name: common
+  repository: https://truecharts.org/
+  version: 7.0.12
+deprecated: false
+description: TeamSpeak is software for quality voice communication via the Internet.
+home: https://github.com/truecharts/apps/tree/master/charts/stable/teamspeak3
+icon: https://raw.githubusercontent.com/docker-library/docs/618191cf82de051ff6661c3c8b82cfca1b663972/teamspeak/logo.png
+keywords:
+- voice server
+- teamspeak
+- teamspeak3
+- teamspeak server
+kubeVersion: '>=1.16.0-0'
+maintainers:
+- email: info@truecharts.org
+  name: TrueCharts
+  url: truecharts.org
+name: teamspeak3
+sources:
+- https://hub.docker.com/_/teamspeak
+- https://www.teamspeak.com/en/
+type: application
+version: 0.0.1
diff --git a/charts/incubator/teamspeak3/README.md b/charts/incubator/teamspeak3/README.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/charts/incubator/teamspeak3/SCALE/CHANGELOG.md b/charts/incubator/teamspeak3/SCALE/CHANGELOG.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/charts/incubator/teamspeak3/SCALE/item.yaml b/charts/incubator/teamspeak3/SCALE/item.yaml
new file mode 100644
index 00000000000..aea6dc8af19
--- /dev/null
+++ b/charts/incubator/teamspeak3/SCALE/item.yaml
@@ -0,0 +1,3 @@
+categories:
+  - voice
+icon_url: https://raw.githubusercontent.com/docker-library/docs/618191cf82de051ff6661c3c8b82cfca1b663972/teamspeak/logo.png
diff --git a/charts/incubator/teamspeak3/SCALE/ix_values.yaml b/charts/incubator/teamspeak3/SCALE/ix_values.yaml
new file mode 100644
index 00000000000..1da877522b8
--- /dev/null
+++ b/charts/incubator/teamspeak3/SCALE/ix_values.yaml
@@ -0,0 +1,16 @@
+##
+# This file contains Values.yaml content that gets added to the output of questions.yaml
+# It's ONLY meant for content that the user is NOT expected to change.
+# Example: Everything under "image" is not included in questions.yaml but is included here.
+##
+
+image:
+  repository: teamspeak
+  tag: 3.13.6@sha256:ff7a92727ffbf05925b54bb12e65bfee311d4193fc68e175dacd63a0048c28bf
+  pullPolicy: IfNotPresent
+
+
+##
+# Most other defaults are set in questions.yaml
+# For other options please refer to the wiki, default_values.yaml or the common library chart
+##
diff --git a/charts/incubator/teamspeak3/SCALE/questions.yaml b/charts/incubator/teamspeak3/SCALE/questions.yaml
new file mode 100644
index 00000000000..2251771963d
--- /dev/null
+++ b/charts/incubator/teamspeak3/SCALE/questions.yaml
@@ -0,0 +1,682 @@
+# Include{groups}
+questions:
+  # Portal
+  - variable: portal
+    group: "Container Image"
+    label: "Configure Portal Button"
+    schema:
+      type: dict
+      hidden: true
+      attrs:
+        - variable: enabled
+          label: "Enable"
+          description: "enable the portal button"
+          schema:
+            hidden: true
+            editable: false
+            type: boolean
+            default: false
+  - variable: controller
+    group: "Controller"
+    label: ""
+    schema:
+      type: dict
+      attrs:
+        - variable: type
+          description: "Please specify type of workload to deploy"
+          label: "(Advanced) Controller Type"
+          schema:
+            type: string
+            default: "deployment"
+            required: true
+            enum:
+              - value: "deployment"
+                description: "Deployment"
+              - value: "statefulset"
+                description: "Statefulset"
+              - value: "daemonset"
+                description: "Daemonset"
+        - variable: replicas
+          description: "Number of desired pod replicas"
+          label: "Desired Replicas"
+          schema:
+            type: int
+            default: 1
+            required: true
+        - variable: strategy
+          description: "Please specify type of workload to deploy"
+          label: "(Advanced) Update Strategy"
+          schema:
+            type: string
+            default: "Recreate"
+            required: true
+            enum:
+              - value: "Recreate"
+                description: "Recreate: Kill existing pods before creating new ones"
+              - value: "RollingUpdate"
+                description: "RollingUpdate: Create new pods and then kill old ones"
+              - value: "OnDelete"
+                description: "(Legacy) OnDelete: ignore .spec.template changes"
+
+# Include{controllerExpert}
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      type: dict
+      attrs:
+        - variable: TZ
+          label: "Timezone"
+          schema:
+            type: string
+            default: "Etc/UTC"
+            $ref:
+              - "definitions/timezone"
+        - variable: TS3SERVER_LICENSE
+          label: "TS3SERVER_LICENSE"
+          description: "Accept TS3SERVER LICENSE"
+          schema:
+            hidden: true
+            editable: false
+            type: string
+            default: "accept"
+
+# Include{containerConfig}
+
+  - variable: service
+    group: "Networking and Services"
+    label: "Configure Service(s)"
+    schema:
+      type: dict
+      attrs:
+        - variable: main
+          label: "Server Query Service"
+          description: "The server query service of teamspeak3"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service Type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
+                schema:
+                  type: string
+                  default: "NodePort"
+                  enum:
+                    - value: "NodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+                    - value: "LoadBalancer"
+                      description: "LoadBalancer"
+              - variable: loadBalancerIP
+                label: "LoadBalancer IP"
+                description: "LoadBalancerIP"
+                schema:
+                  show_if: [["type", "=", "LoadBalancer"]]
+                  type: string
+                  default: ""
+              - variable: externalIPs
+                label: "External IP's"
+                description: "External IP's"
+                schema:
+                  show_if: [["type", "=", "LoadBalancer"]]
+                  type: list
+                  default: []
+                  items:
+                    - variable: externalIP
+                      label: "External IP"
+                      schema:
+                        type: string
+              - variable: ports
+                label: "Service's Port(s) Configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: main
+                      label: "Server Query Service Port Configuration"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: enabled
+                            label: "Enable the port"
+                            schema:
+                              type: boolean
+                              default: true
+                              hidden: true
+                          - variable: protocol
+                            label: "Port Type"
+                            schema:
+                              type: string
+                              default: "TCP"
+                              enum:
+                                - value: HTTP
+                                  description: "HTTP"
+                                - value: "HTTPS"
+                                  description: "HTTPS"
+                                - value: TCP
+                                  description: "TCP"
+                                - value: "UDP"
+                                  description: "UDP"
+                          - variable: targetPort
+                            label: "Target Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10011
+                              editable: false
+                              hidden: true
+                          - variable: port
+                            label: "Container Port"
+                            schema:
+                              type: int
+                              default: 10011
+                              editable: true
+                              required: true
+                          - variable: nodePort
+                            label: "Node Port (Optional)"
+                            description: "This port gets exposed to the node. Only considered when service type is NodePort"
+                            schema:
+                              type: int
+                              min: 9000
+                              max: 65535
+                              default: 36104
+        - variable: voice
+          label: "Voice Service"
+          description: "The voice service of teamspeak3"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Service Type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
+                schema:
+                  type: string
+                  default: "NodePort"
+                  enum:
+                    - value: "NodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+                    - value: "LoadBalancer"
+                      description: "LoadBalancer"
+              - variable: loadBalancerIP
+                label: "LoadBalancer IP"
+                description: "LoadBalancerIP"
+                schema:
+                  show_if: [["type", "=", "LoadBalancer"]]
+                  type: string
+                  default: ""
+              - variable: externalIPs
+                label: "External IP's"
+                description: "External IP's"
+                schema:
+                  show_if: [["type", "=", "LoadBalancer"]]
+                  type: list
+                  default: []
+                  items:
+                    - variable: externalIP
+                      label: "External IP"
+                      schema:
+                        type: string
+              - variable: ports
+                label: "Service's Port(s) Configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: voice
+                      label: "Voice Service Port Configuration"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: enabled
+                            label: "Enable the port"
+                            schema:
+                              type: boolean
+                              default: true
+                              hidden: true
+                          - variable: protocol
+                            label: "Port Type"
+                            schema:
+                              type: string
+                              default: "UDP"
+                              enum:
+                                - value: HTTP
+                                  description: "HTTP"
+                                - value: "HTTPS"
+                                  description: "HTTPS"
+                                - value: TCP
+                                  description: "TCP"
+                                - value: "UDP"
+                                  description: "UDP"
+                          - variable: targetPort
+                            label: "Target Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 9987
+                              editable: false
+                              hidden: true
+                          - variable: port
+                            label: "Container Port"
+                            schema:
+                              type: int
+                              default: 9987
+                              editable: true
+                              required: true
+                          - variable: nodePort
+                            label: "Node Port (Optional)"
+                            description: "This port gets exposed to the node. Only considered when service type is NodePort"
+                            schema:
+                              type: int
+                              min: 9000
+                              max: 65535
+                              default: 36105
+        - variable: files
+          label: "Server File Transport Service"
+          description: "The file transport service of teamspeak3"
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the service"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: false
+              - variable: type
+                label: "Service Type"
+                description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
+                schema:
+                  type: string
+                  default: "NodePort"
+                  enum:
+                    - value: "NodePort"
+                      description: "NodePort"
+                    - value: "ClusterIP"
+                      description: "ClusterIP"
+                    - value: "LoadBalancer"
+                      description: "LoadBalancer"
+              - variable: loadBalancerIP
+                label: "LoadBalancer IP"
+                description: "LoadBalancerIP"
+                schema:
+                  show_if: [["type", "=", "LoadBalancer"]]
+                  type: string
+                  default: ""
+              - variable: externalIPs
+                label: "External IP's"
+                description: "External IP's"
+                schema:
+                  show_if: [["type", "=", "LoadBalancer"]]
+                  type: list
+                  default: []
+                  items:
+                    - variable: externalIP
+                      label: "External IP"
+                      schema:
+                        type: string
+              - variable: ports
+                label: "Service's Port(s) Configuration"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: files
+                      label: "Server File Transport Service Port Configuration"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: enabled
+                            label: "Enable the port"
+                            schema:
+                              type: boolean
+                              default: true
+                              hidden: true
+                          - variable: protocol
+                            label: "Port Type"
+                            schema:
+                              type: string
+                              default: "TCP"
+                              enum:
+                                - value: HTTP
+                                  description: "HTTP"
+                                - value: "HTTPS"
+                                  description: "HTTPS"
+                                - value: TCP
+                                  description: "TCP"
+                                - value: "UDP"
+                                  description: "UDP"
+                          - variable: targetPort
+                            label: "Target Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 30033
+                              editable: false
+                              hidden: true
+                          - variable: port
+                            label: "Container Port"
+                            schema:
+                              type: int
+                              default: 30033
+                              editable: true
+                              required: true
+                          - variable: nodePort
+                            label: "Node Port (Optional)"
+                            description: "This port gets exposed to the node. Only considered when service type is NodePort"
+                            schema:
+                              type: int
+                              min: 9000
+                              max: 65535
+                              default: 36106
+
+  - variable: serviceexpert
+    group: "Networking and Services"
+    label: "Show Expert Config"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: hostNetwork
+          group: "Networking and Services"
+          label: "Host-Networking (Complicated)"
+          schema:
+            type: boolean
+            default: false
+
+        - variable: dnsPolicy
+          group: "Networking and Services"
+          label: "dnsPolicy"
+          schema:
+            type: string
+            default: ""
+            enum:
+              - value: ""
+                description: "Default"
+              - value: "ClusterFirst"
+                description: "ClusterFirst"
+              - value: "ClusterFirstWithHostNet"
+                description: "ClusterFirstWithHostNet"
+              - value: "None"
+                description: "None"
+
+        - variable: dnsConfig
+          label: "DNS Configuration"
+          group: "Networking and Services"
+          description: "Specify custom DNS configuration which will be applied to the pod"
+          schema:
+            type: dict
+            attrs:
+              - variable: nameservers
+                label: "Nameservers"
+                schema:
+                  default: []
+                  type: list
+                  items:
+                    - variable: nameserver
+                      label: "Nameserver"
+                      schema:
+                        type: string
+              - variable: options
+                label: "options"
+                schema:
+                  default: []
+                  type: list
+                  items:
+                    - variable: option
+                      label: "Option Entry"
+                      schema:
+                        type: string
+              - variable: searches
+                label: "Searches"
+                schema:
+                  default: []
+                  type: list
+                  items:
+                    - variable: search
+                      label: "Search Entry"
+                      schema:
+                        type: string
+
+# Include{serviceList}
+
+  - variable: persistence
+    label: "Integrated Persistent Storage"
+    group: "Storage and Persistence"
+    schema:
+      type: dict
+      attrs:
+        - variable: data
+          label: "App Config Storage"
+          description: "Stores the Application Configuration."
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the storage"
+                schema:
+                  type: boolean
+                  default: true
+              - variable: type
+                label: "(Advanced) Type of Storage"
+                description: "Sets the persistence type"
+                schema:
+                  type: string
+                  default: "pvc"
+                  enum:
+                    - value: "pvc"
+                      description: "pvc"
+                    - value: "emptyDir"
+                      description: "emptyDir"
+                    - value: "hostPath"
+                      description: "hostPath"
+              - variable: storageClass
+                label: "(Advanced) storageClass"
+                description: " Warning: Anything other than SCALE-ZFS will break rollback!"
+                schema:
+                  show_if: [["type", "=", "pvc"]]
+                  type: string
+                  default: "SCALE-ZFS"
+              - variable: setPermissions
+                label: "Automatic Permissions"
+                description: "Automatically set permissions on install"
+                schema:
+                  show_if: [["type", "=", "hostPath"]]
+                  type: boolean
+                  default: true
+              - variable: readOnly
+                label: "readOnly"
+                schema:
+                  type: boolean
+                  default: false
+              - variable: hostPath
+                label: "hostPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  show_if: [["type", "=", "hostPath"]]
+                  type: hostpath
+              - variable: hostPathType
+                label: "hostPath Type"
+                schema:
+                  show_if: [["type", "=", "hostPath"]]
+                  type: string
+                  default: ""
+                  enum:
+                    - value: ""
+                      description: "Default"
+                    - value: "DirectoryOrCreate"
+                      description: "DirectoryOrCreate"
+                    - value: "Directory"
+                      description: "Directory"
+                    - value: "FileOrCreate"
+                      description: "FileOrCreate"
+                    - value: "File"
+                      description: "File"
+                    - value: "Socket"
+                      description: "Socket"
+                    - value: "CharDevice"
+                      description: "CharDevice"
+                    - value: "BlockDevice"
+                      description: "BlockDevice"
+              - variable: mountPath
+                label: "mountPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  type: string
+                  default: "/var/ts3server/"
+                  hidden: true
+              - variable: medium
+                label: "EmptyDir Medium"
+                schema:
+                  show_if: [["type", "=", "emptyDir"]]
+                  type: string
+                  default: ""
+                  enum:
+                    - value: ""
+                      description: "Default"
+                    - value: "Memory"
+                      description: "Memory"
+              - variable: accessMode
+                label: "Access Mode (Advanced)"
+                description: "Allow or disallow multiple PVC's writhing to the same PV"
+                schema:
+                  show_if: [["type", "=", "pvc"]]
+                  type: string
+                  default: "ReadWriteOnce"
+                  enum:
+                    - value: "ReadWriteOnce"
+                      description: "ReadWriteOnce"
+                    - value: "ReadOnlyMany"
+                      description: "ReadOnlyMany"
+                    - value: "ReadWriteMany"
+                      description: "ReadWriteMany"
+              - variable: size
+                label: "Size quotum of storage"
+                schema:
+                  show_if: [["type", "=", "pvc"]]
+                  type: string
+                  default: "100Gi"
+
+# Include{persistenceList}
+
+# Include{ingressList}
+
+  - variable: securityContext
+    group: "Security and Permissions"
+    label: "Security Context"
+    schema:
+      type: dict
+      attrs:
+        - variable: privileged
+          label: Privileged mode
+          schema:
+            type: boolean
+            default: false
+        - variable: readOnlyRootFilesystem
+          label: "ReadOnly Root Filesystem"
+          schema:
+            type: boolean
+            default: false
+        - variable: allowPrivilegeEscalation
+          label: "Allow Privilege Escalation"
+          schema:
+            type: boolean
+            default: true
+        - variable: runAsNonRoot
+          label: "runAsNonRoot"
+          schema:
+            type: boolean
+            default: false
+  - variable: resources
+    group: "Resources and Devices"
+    label: ""
+    schema:
+      type: dict
+      attrs:
+        - variable: limits
+          label: "Advanced Limit Resource Consumption"
+          schema:
+            type: dict
+            attrs:
+              - variable: cpu
+                label: "CPU"
+                schema:
+                  type: string
+                  default: "2000m"
+                  valid_chars: '^([0-9]+)(\.[0-9]?|m?)$'
+              - variable: memory
+                label: "Memory RAM"
+                schema:
+                  type: string
+                  default: "2Gi"
+                  valid_chars: '^([0-9.]+)([EPTGMK]i?|[EPTGMK]?|e[0-9]+)$'
+        - variable: requests
+          label: "Advanced Request minimum resources required"
+          schema:
+            type: dict
+            attrs:
+              - variable: cpu
+                label: "CPU"
+                schema:
+                  type: string
+                  default: "10m"
+                  valid_chars: '^([0-9]+)(\.[0-9]?|m?)$'
+              - variable: memory
+                label: "Memory RAM"
+                schema:
+                  type: string
+                  default: "50Mi"
+                  valid_chars: '^([0-9.]+)([EPTGMK]i?|[EPTGMK]?|e[0-9]+)$'
+  - variable: autoscaling
+    group: "Resources and Devices"
+    label: "(Advanced) Horizontal Pod Autoscaler"
+    schema:
+      type: dict
+      attrs:
+        - variable: enabled
+          label: "enabled"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: target
+                label: "Target"
+                description: "deployment name, defaults to main deployment"
+                schema:
+                  type: string
+                  default: ""
+              - variable: minReplicas
+                label: "Minimum Replicas"
+                schema:
+                  type: int
+                  default: 1
+              - variable: maxReplicas
+                label: "Maximum Replicas"
+                schema:
+                  type: int
+                  default: 5
+              - variable: targetCPUUtilizationPercentage
+                label: "Target CPU Utilization Percentage"
+                schema:
+                  type: int
+                  default: 80
+              - variable: targetMemoryUtilizationPercentage
+                label: "Target Memory Utilization Percentage"
+                schema:
+                  type: int
+                  default: 80
+
+# Include{addons}
diff --git a/charts/incubator/teamspeak3/app-readme.md b/charts/incubator/teamspeak3/app-readme.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/charts/incubator/teamspeak3/helm-values.md b/charts/incubator/teamspeak3/helm-values.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/charts/incubator/teamspeak3/templates/common.yaml b/charts/incubator/teamspeak3/templates/common.yaml
new file mode 100644
index 00000000000..a6613c2ce21
--- /dev/null
+++ b/charts/incubator/teamspeak3/templates/common.yaml
@@ -0,0 +1 @@
+{{ include "common.all" . }}
diff --git a/charts/incubator/teamspeak3/values.yaml b/charts/incubator/teamspeak3/values.yaml
new file mode 100644
index 00000000000..a20a5b253b0
--- /dev/null
+++ b/charts/incubator/teamspeak3/values.yaml
@@ -0,0 +1,45 @@
+# Default values for teamspeak3.
+
+image:
+  repository: teamspeak
+  pullPolicy: IfNotPresent
+  tag: 3.13.6@sha256:ff7a92727ffbf05925b54bb12e65bfee311d4193fc68e175dacd63a0048c28bf
+
+#  9987 default voice
+# 10011 server query
+# 30033 file transport
+service:
+  main:
+    enabled: true
+    type: ClusterIP
+    ports:
+      main:
+        enabled: true
+        port: 10011
+        protocol: "TCP"
+  voice:
+    enabled: true
+    ports:
+      voice:
+        enabled: true
+        port: 9987
+        protocol: "UDP"
+  files:
+    enabled: true
+    type: ClusterIP
+    ports:
+      files:
+        enabled: true
+        port: 30033
+        protocol: "TCP"
+
+env:
+  TS3SERVER_LICENSE: accept
+
+persistence:
+  config:
+    enabled: true
+    mountPath: "/var/ts3server/"
+    type: pvc
+    accessMode: ReadWriteOnce
+    size: "100Gi"
diff --git a/docs/manual/default-ports.md b/docs/manual/default-ports.md
index 9e059241240..5a3f3770a07 100644
--- a/docs/manual/default-ports.md
+++ b/docs/manual/default-ports.md
@@ -123,5 +123,8 @@ These defaults can ofcoarse be changed, but as we guarantee "sane, working defau
 | pihole              |  main     |  36101   |                   |                                      |
 | Sogo                |  main     |  36102   |                   |                                      |
 | oscam               |  main     |  36103   |                   |                                      |
+| teamspeak3          |  main     |  36104   |                   |                                      |
+| teamspeak3          |  query    |  36105   |                   |                                      |
+| teamspeak3          |  files    |  36106   |                   |                                      |
 
 #### Note: TCP and UPD ports that are the same in each App, are not by mistake.