diff --git a/omada_v3/rootfs/etc/cont-init.d/00-folders.sh b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh
index 06d8a0311..b641086a8 100644
--- a/omada_v3/rootfs/etc/cont-init.d/00-folders.sh
+++ b/omada_v3/rootfs/etc/cont-init.d/00-folders.sh
@@ -10,21 +10,15 @@ if [ ! -f "$CONFIGSOURCE" ]; then
 fi
 
 # Ensure structure is correct
-mkdir -p "$CONFIGSOURCE"/db "$CONFIGSOURCE"/html "$CONFIGSOURCE"/pdf
 cp -rnf /opt/tplink/EAPController/data/* "$CONFIGSOURCE"
 
 # Make sure permissions are right
 echo "Updating permissions"
 chown -R "508:508" "$CONFIGSOURCE"
 
-# Delete previous directories
-echo "Removing previous directories"
-rm -r /opt/tplink/EAPController/data/html
-rm -r /opt/tplink/EAPController/data/pdf
-rm -r /opt/tplink/EAPController/data/db
-
-# Create symlink
-echo "Creating symlink"
-ln -s "$CONFIGSOURCE"/pdf /opt/tplink/EAPController/data/pdf
-ln -s "$CONFIGSOURCE"/omada/html /opt/tplink/EAPController/data/html
-ln -s "$CONFIGSOURCE"/db /opt/tplink/EAPController/data/db
+for d in /opt/tplink/EAPController/data/*/ ; do
+    echo "Moving $d"
+    rm -r "$d"
+    mkdir -p "$CONFIGSOURCE/$(basename $d)"
+    ln -s "$CONFIGSOURCE/$(basename $d)" "$d"
+done