diff --git a/teamspeak/data/.gitkeep b/teamspeak/data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/teamspeak/docker-compose.yml b/teamspeak/docker-compose.yml
new file mode 100644
index 00000000..a09faf47
--- /dev/null
+++ b/teamspeak/docker-compose.yml
@@ -0,0 +1,31 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: teamspeak_ui_1
+      APP_PORT: 8080
+  
+  ui:
+    image: joni1802/ts3-manager:v2.2.1@sha256:d69890c323e8715cef0f625036c7c51ec7e7da321438897633fff5df83da1e39
+    user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1m
+    environment:
+      JWT_SECRET: $APP_SEED
+
+  server:
+    image: teamspeak:3.13.7@sha256:b5bdec55bc87b992c5658e739f3ce465644efa6d997633110b12be3dc3a10796
+    # TeamSpeak does not support running with a different user
+    #user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1m
+    ports:
+      - 9987:9987/udp
+      - 10011:10011
+      - 30033:30033
+    volumes:
+      - ${APP_DATA_DIR}/data:/var/ts3server
+    environment:
+      TS3SERVER_LICENSE: accept
+      TS3SERVER_SERVERADMIN_PASSWORD: $APP_PASSWORD
\ No newline at end of file
diff --git a/teamspeak/umbrel-app.yml b/teamspeak/umbrel-app.yml
new file mode 100644
index 00000000..b68d6253
--- /dev/null
+++ b/teamspeak/umbrel-app.yml
@@ -0,0 +1,81 @@
+manifestVersion: 1
+id: teamspeak
+name: TeamSpeak
+tagline: Easy, Secure, and High-Quality Communication for Gaming, Learning, Business, and more
+category: social
+version: "3.13.7"
+port: 50371
+description: >-
+  Use crystal clear sound to communicate with your team mates cross-platform with military-grade security, lag-free performance &
+  unparalleled reliability and uptime.
+  
+
+  🛠️ SET-UP INSTRUCTIONS
+
+  1) Download the TeamSpeak client for your preferred platform: https://www.teamspeak.com/downloads.
+  You will connect your client to the TeamSpeak app on your Umbrel.
+
+
+  2) Log in to the TeamSpeak app on your Umbrel device using the following login details:
+
+  - Server: teamspeak_server_1
+
+  - Port: 10011
+
+  - SSH: off
+
+  - Name: serveradmin (the default username shown here in the app store and when you right-click on the app icon from the homescreen)
+
+  - Password: (the default password shown here in the app store and when you right-click on the app icon from the homescreen)
+
+  3) Claim your server from within the TeamSpeak client by creating a Privilege Key in the TeamSpeak app on your Umbrel and redeeming it in the client.
+
+
+  🎙️ Unrivaled voice quality
+
+  Get crystal-clear, lag-free communication with our integrated automatic microphone volume adjustment, background noise reduction
+  and echo cancellation. 
+
+
+  🎭 Privacy Build-in
+
+  Designed with privacy in mind, we do not have access to your voice or text chat data, and there is no sign-up required.
+
+
+  🛡️ SECURITY LIKE NO OTHER
+
+  Integrated Military-Grade Security as standard. With TS3, AES-based encryption can be enabled for the entire server, or even just
+  specific channels.
+
+
+  🎚️ Advanced permissions system
+
+  Be in complete control with our powerful, best-in-market, hierarchical permission system. Decide who can talk, who can join channels
+  and much more.
+
+
+  🔊 Stunning surround sound
+
+  Be at the heart of the game with Positional Audio. Hear your team mates within a 360º soundscape, giving you the edge when executing
+  your next game plan.
+
+
+  🎨 Limitless customization
+
+  Make TeamSpeak your own and customize your client to meet your personal style with the included plugins, sound & icon packs, and
+  themes. Choose from hundreds of add-ons created by the user community, or even create your own.
+
+developer: TeamSpeak Systems, Inc.
+website: https://www.teamspeak.com
+submitter: Sharknoon
+submission: https://github.com/getumbrel/umbrel-apps/pull/1112
+support: https://support.teamspeak.com
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+releaseNotes: ""
+dependencies: []
+path: ""
+defaultUsername: serveradmin
+deterministicPassword: true
\ No newline at end of file