diff --git a/webtop/rootfs/etc/cont-init.d/20-folders.sh b/webtop/rootfs/etc/cont-init.d/20-folders.sh
index e1ff9782a..315b3da40 100644
--- a/webtop/rootfs/etc/cont-init.d/20-folders.sh
+++ b/webtop/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,13 +1,15 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 
-for FOLDERS in "Desktop" "thinclient_drives" ".config"; do
-mkdir -p /share/webtop-alpine/$FOLDERS
-if [ -d /config/$FOLDERS ]; then
-  cp /config/$FOLDERS/* /share/webtop-alpine/$FOLDERS
-  rm -r /config/$FOLDERS
-fi
-ln -s /share/webtop-alpine/$FOLDERS /config
-done
+HOME=${HOME:-/share/webtop}
+mkdir -p $HOME
+chown -R abc:abc $HOME
+bashio::log.info "Your files are located in $HOME"
 
-echo "Data folder set to /share/webtop-alpine"
-chown -R abc:abc /share/webtop-alpine
+#for FOLDERS in "Desktop" "thinclient_drives" ".config"; do
+#mkdir -p /share/webtop-alpine/$FOLDERS
+#if [ -d /config/$FOLDERS ]; then
+#  cp /config/$FOLDERS/* /share/webtop-alpine/$FOLDERS
+#  rm -r /config/$FOLDERS
+#fi
+#ln -s /share/webtop-alpine/$FOLDERS /config
+#done