diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 80a44f388..b744288fe 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -33,7 +33,12 @@ RUN \
     && sed -i 's=/config/keys/cert.crt=/ssl/fullchain.pem=g' /defaults/default \
     && sed -i 's=/config/keys/cert.key=/ssl/privkey.pem=g' /defaults/default
     # Use data instead of config
-    #&& sed -i 's/config/data/g' /defaults/default \
-    #&& sed -i 's/config/data/g' /etc/cont-init.d/40-install
+    && sed -i 's|/config|/data|g' /defaults/default \
+    && files=$(grep -rl "/config" /etc/cont-init.d \
+    && echo $files | xargs sed -i "s|/config|/data|g" \    
+    && files=$(grep -rl "/config" /etc/system.d \
+    && echo $files | xargs sed -i "s|/config|/data|g"
+    #&& sed -i "s|/config|/emby|g" /etc/cont-init.d/30-config \
+    #&& sed -i 's|/config|/data|g' /etc/cont-init.d/40-install
 
 VOLUME [ "/data" ]