diff --git a/teamspeak/rootfs/etc/cont-init.d/20-folders.sh b/teamspeak/rootfs/etc/cont-init.d/20-folders.sh
index 9539d0e18..de73d53ff 100644
--- a/teamspeak/rootfs/etc/cont-init.d/20-folders.sh
+++ b/teamspeak/rootfs/etc/cont-init.d/20-folders.sh
@@ -2,13 +2,12 @@
 # shellcheck shell=bash
 
 # Data remanence for /teamspeak/save
-if [ -d /teamspeak/save ]; then
-    cp -rn /teamspeak/save/* /data
-    rm -r /teamspeak/save
+if [ -d /teamspeak ]; then
+    cp -rn /teamspeak/* /data
+    rm -r /teamspeak
+    ln -sf /data /teamspeak
+    chmod -R 777 /teamspeak
 fi
-mkdir -p /teamspeak
-ln -sf /data /teamspeak/save
+
 #chown -R PUID:GUID /data
 chmod -R 777 /data
-#chown -R PUID:GUID /data
-chmod -R 777 /teamspeak