diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 66543045c..062140737 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -28,19 +28,20 @@ RUN \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
-    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
+    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
     # Set ssl with letsencrypt defaults
-    # && 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 \
-    # && sed -i 's=/config/keys/cert.crt=/ssl/fullchain.pem=g' /etc/cont-init.d/30-keygen \
-    # && sed -i 's=/config/keys/cert.key=/ssl/privkey.pem=g' /etc/cont-init.d/30-keygen \
+    && 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 \
+    && sed -i 's=/config/keys/cert.crt=/ssl/fullchain.pem=g' /etc/cont-init.d/30-keygen \
+    && sed -i 's=/config/keys/cert.key=/ssl/privkey.pem=g' /etc/cont-init.d/30-keygen \
     # Use data instead of config
     # && 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/services.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
+    && sed -i "s|/config|/data/piwigo|g" /etc/cont-init.d/30-config \
+    && sed -i 's|/config|/data/piwigo|g' /etc/cont-init.d/40-install \
+    && sed -i 's|/config|/data/piwigo|g' /etc/services.d/piwigo/run
 
 VOLUME [ "/data" ]