diff --git a/charts/incubator/piwigo/.helmignore b/charts/stable/piwigo/.helmignore
similarity index 100%
rename from charts/incubator/piwigo/.helmignore
rename to charts/stable/piwigo/.helmignore
diff --git a/charts/incubator/piwigo/CHANGELOG.md b/charts/stable/piwigo/CHANGELOG.md
similarity index 100%
rename from charts/incubator/piwigo/CHANGELOG.md
rename to charts/stable/piwigo/CHANGELOG.md
diff --git a/charts/incubator/piwigo/Chart.yaml b/charts/stable/piwigo/Chart.yaml
similarity index 98%
rename from charts/incubator/piwigo/Chart.yaml
rename to charts/stable/piwigo/Chart.yaml
index b54309d72ad..00945707788 100644
--- a/charts/incubator/piwigo/Chart.yaml
+++ b/charts/stable/piwigo/Chart.yaml
@@ -27,7 +27,7 @@ sources:
   - http://piwigo.org/
   - https://github.com/linuxserver/docker-piwigo
 type: application
-version: 6.1.0
+version: 6.1.1
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/piwigo/README.md b/charts/stable/piwigo/README.md
similarity index 100%
rename from charts/incubator/piwigo/README.md
rename to charts/stable/piwigo/README.md
diff --git a/charts/incubator/piwigo/icon.png b/charts/stable/piwigo/icon.png
similarity index 100%
rename from charts/incubator/piwigo/icon.png
rename to charts/stable/piwigo/icon.png
diff --git a/charts/incubator/piwigo/questions.yaml b/charts/stable/piwigo/questions.yaml
similarity index 92%
rename from charts/incubator/piwigo/questions.yaml
rename to charts/stable/piwigo/questions.yaml
index 348a9475b94..5df74224942 100644
--- a/charts/incubator/piwigo/questions.yaml
+++ b/charts/stable/piwigo/questions.yaml
@@ -22,29 +22,25 @@ questions:
       type: dict
       attrs:
         - variable: language
-          label: Language
-          description: Set the initial Language
+          label: Set Language (initial install only)
           schema:
             type: string
             default: "en_US"
         - variable: admin_user
-          label: Admin user
-          description: Set the initial admin user
+          label: Set Admin User (initial install only)
           schema:
             type: string
             required: true
             default: ""
         - variable: admin_pass
-          label: Admin Password
-          description: Set the initial admin password
+          label: Set Admin Password (initial install only)
           schema:
             type: string
             required: true
             private: true
             default: ""
         - variable: admin_email
-          label: Admin Email
-          description: Set the initial admin email
+          label: Set Admin Email (initial install only)
           schema:
             type: string
             required: true
diff --git a/charts/incubator/piwigo/templates/NOTES.txt b/charts/stable/piwigo/templates/NOTES.txt
similarity index 100%
rename from charts/incubator/piwigo/templates/NOTES.txt
rename to charts/stable/piwigo/templates/NOTES.txt
diff --git a/charts/incubator/piwigo/templates/common.yaml b/charts/stable/piwigo/templates/common.yaml
similarity index 100%
rename from charts/incubator/piwigo/templates/common.yaml
rename to charts/stable/piwigo/templates/common.yaml
diff --git a/charts/incubator/piwigo/values.yaml b/charts/stable/piwigo/values.yaml
similarity index 95%
rename from charts/incubator/piwigo/values.yaml
rename to charts/stable/piwigo/values.yaml
index 08bc56d3ec4..f1f9f2206a5 100644
--- a/charts/incubator/piwigo/values.yaml
+++ b/charts/stable/piwigo/values.yaml
@@ -39,7 +39,7 @@ workload:
                     echo "POSTSETUP exists, no further action is needed."
                   else
                     while ! curl -s -o -v /dev/null http://localhost/install.php; do sleep 1; done && \
-                    curl -v -X POST -d "language={{ .Values.piwigo.language }}&dbhost={{ .Values.mariadb.creds.plainhost | trimAll "\"" }}:3306&dbuser={{ .Values.mariadb.mariadbUsername }}&dbpasswd={{ .Values.mariadb.creds.mariadbPassword | trimAll "\"" }}&dbname={{ .Values.mariadb.mariadbDatabase }}&prefix=piwigo_&admin_name={{ .Values.piwigo.admin_user }}&admin_pass1={{ .Values.piwigo.admin_pass }}&admin_pass2={{ .Values.piwigo.admin_pass }}&admin_mail={{ .Values.piwigo.admin_email }}&install=Start+installation" http://localhost/install.php && \
+                    curl -v -X POST -d "language={{ .Values.piwigo.language }}&dbhost={{ .Values.mariadb.creds.plainhost | trimAll "\"" }}:3306&dbuser={{ .Values.mariadb.mariadbUsername }}&dbpasswd={{ .Values.mariadb.creds.mariadbPassword | trimAll "\"" }}&dbname={{ .Values.mariadb.mariadbDatabase }}&prefix=piwigo_&admin_name={{ .Values.piwigo.admin_user }}&admin_pass1={{ .Values.piwigo.admin_pass }}&admin_pass2={{ .Values.piwigo.admin_pass }}&admin_mail={{ .Values.piwigo.admin_email }}&install=Start+installation" http://localhost/install.php?language={{ .Values.piwigo.language }} && \
                     ( touch "/config/POSTSETUP" && echo "Created POSTSETUP!") || \
                     ( echo "Failed to create POSTSETUP file..." && exit 1 )
                   fi