diff --git a/piwigo/rootfs/etc/cont-init.d/41-folders b/piwigo/rootfs/etc/cont-init.d/41-folders
index f6afe1af3..37acd7a86 100644
--- a/piwigo/rootfs/etc/cont-init.d/41-folders
+++ b/piwigo/rootfs/etc/cont-init.d/41-folders
@@ -12,3 +12,12 @@ if [ ! -d /data/config ]; then
   ln -s /data/config /gallery/local
   echo "links done"
 fi
+
+# If keys don't exist, create it
+if [ ! -d /data/keys ]; then
+  echo "moving keys folder"
+  mv /config/keys /data
+  mkdir -p /config/keys
+  ln -s /data/keys /config
+  echo "links done"
+fi