diff --git a/papermerge/rootfs/etc/cont-init.d/20-folders.sh b/papermerge/rootfs/etc/cont-init.d/00-folders.sh
similarity index 74%
rename from papermerge/rootfs/etc/cont-init.d/20-folders.sh
rename to papermerge/rootfs/etc/cont-init.d/00-folders.sh
index 9effc24f4..1b7bb53ed 100644
--- a/papermerge/rootfs/etc/cont-init.d/20-folders.sh
+++ b/papermerge/rootfs/etc/cont-init.d/00-folders.sh
@@ -2,19 +2,18 @@
 
 CONFIGLOCATION=$(bashio::config "CONFIG_LOCATION")
 
+sed -i "s| /data/config| $CONFIGLOCATION|g" /etc/cont-init.d/* \
+sed -i "s| /data/config| $CONFIGLOCATION|g" /defaults/* || true
+
 # Create directory
 mkdir -p $CONFIGLOCATION/config
 
 # Copy previous config if existing
-unlink /data/config 2>/dev/null || true
 if [ -d /data/config ]; then
   echo "Moving to new location $CONFIGLOCATION"
   mv /data/config/* $CONFIGLOCATION/config/
   rm -r /data/config
 fi
 
-# Make symlinks
-ln -s $CONFIGLOCATION/config /data/config
-
 # Make sure permissions are right
 chown -R $(id -u):$(id -g) $CONFIGLOCATION