diff --git a/piwigo/rootfs/etc/cont-init.d/21-folders b/piwigo/rootfs/etc/cont-init.d/21-folders
deleted file mode 100644
index dee5d065f..000000000
--- a/piwigo/rootfs/etc/cont-init.d/21-folders
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-##################
-# SYMLINK CONFIG #
-##################
-
-#Create folders
-
-if [ ! -d /share/piwigo ]; then
-  echo "Creating /share/piwigo"
-  mkdir -p /share/piwigo
-  chown -R abc:abc /share/piwigo
-else
-  chown -R abc:abc /share/piwigo
-fi
-
-if [ ! -d /share/piwigo/config ]; then
-  echo "Creating /share/piwigo/config
-  mkdir -p /share/piwigo/config
-  chown -R abc:abc /share/piwigo/config
-else
-  chown -R abc:abc /share/piwigo/config
-fi
-
-if [ ! -d /share/piwigo/keys ]; then
-  echo "Creating /share/piwigo/keys
-  mkdir -p /share/piwigo/keys
-  chown -R abc:abc /share/piwigo/keys
-else
-  chown -R abc:abc /share/piwigo/keys
-fi
-
-# Create symlinks
-
-echo "Symlink config"
-ln -s /share/piwigo/config /gallery/local || mkdir /gallery/local/config & ln -s /share/piwigo/config /gallery/local
-echo "Symlink keys"
-ln -s /share/piwigo/config/keys /config || mkdir /config/keys  & ln -s /share/piwigo/config/keys /config
diff --git a/piwigo/rootfs/etc/cont-init.d/41-folders b/piwigo/rootfs/etc/cont-init.d/41-folders
new file mode 100644
index 000000000..96846f14d
--- /dev/null
+++ b/piwigo/rootfs/etc/cont-init.d/41-folders
@@ -0,0 +1,37 @@
+#!/usr/bin/with-contenv bash
+
+##################
+# SYMLINK CONFIG #
+##################
+
+#Create folders
+
+if [ ! -d /share/piwigo ]; then
+  echo "Creating /share/piwigo"
+  mkdir -p /share/piwigo
+  chown -R abc:abc /share/piwigo
+else
+  chown -R abc:abc /share/piwigo
+fi
+
+if [ ! -d /share/piwigo/config ]; then
+  echo "moving config folder"
+  mv /gallery/local/config /share/piwigo
+  ln -s /share/piwigo/config /gallery/local
+  echo "links done"
+else
+  rm /gallery/local/config
+  ln -s /share/piwigo/config /gallery/local
+  echo "Using existing config"
+fi
+
+if [ ! -d /share/piwigo/keys ]; then
+  echo "moving keys folder"
+  mv /config/keys /share/piwigo
+  ln -s /share/piwigo/keys /config
+  echo "links done"
+else
+  rm /config/keys
+  ln -s /share/piwigo/keys /config
+  echo "Using existing keys folder"
+fi