diff --git a/charts/stable/picoshare/Chart.yaml b/charts/stable/picoshare/Chart.yaml
index a0b7d26abe8..620a33cf63e 100644
--- a/charts/stable/picoshare/Chart.yaml
+++ b/charts/stable/picoshare/Chart.yaml
@@ -18,7 +18,7 @@ name: picoshare
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/picoshare
   - https://github.com/mtlynch/picoshare
-version: 6.0.1
+version: 6.0.2
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/picoshare/questions.yaml b/charts/stable/picoshare/questions.yaml
index 57d74ecc551..79d8eec1bcc 100644
--- a/charts/stable/picoshare/questions.yaml
+++ b/charts/stable/picoshare/questions.yaml
@@ -20,39 +20,53 @@ questions:
                                     type: dict
                                     attrs:
                                       - variable: PS_SHARED_SECRET
-                                        label: "PS_SHARED_SECRET"
-                                        description: "Secret Key for Web Console."
+                                        label: "Admin Web Password"
+                                        description: "Specifies a passphrase for the admin user to log in to PicoShare."
                                         schema:
                                           type: string
                                           required: true
                                           private: true
                                           default: ""
-                                      - variable: LITESTREAM_BUCKET
-                                        label: "LITESTREAM_BUCKET"
-                                        description: "If you specify settings for a Litestream-compatible cloud storage location, PicoShare will automatically replicate your data."
+                                      - variable: lightstream
+                                        label: Show Advanced LightStream Settings
                                         schema:
-                                          type: string
-                                          default: ""
-                                      - variable: LITESTREAM_ENDPOINT
-                                        label: "LITESTREAM_ENDPOINT"
-                                        description: "If you specify settings for a Litestream-compatible cloud storage location, PicoShare will automatically replicate your data."
-                                        schema:
-                                          type: string
-                                          default: ""
-                                      - variable: LITESTREAM_ACCESS_KEY_ID
-                                        label: "LITESTREAM_ACCESS_KEY_ID"
-                                        description: "If you specify settings for a Litestream-compatible cloud storage location, PicoShare will automatically replicate your data."
-                                        schema:
-                                          type: string
-                                          private: true
-                                          default: ""
-                                      - variable: LITESTREAM_SECRET_ACCESS_KEY
-                                        label: "LITESTREAM_SECRET_ACCESS_KEY"
-                                        description: "If you specify settings for a Litestream-compatible cloud storage location, PicoShare will automatically replicate your data."
-                                        schema:
-                                          type: string
-                                          private: true
-                                          default: ""
+                                          type: boolean
+                                          default: false
+                                          show_subquestions_if: true
+                                          subquestions:
+                                            - variable: LITESTREAM_BUCKET
+                                              label: "LightStream Bucket"
+                                              description: "Compatible cloud storage bucket where Litestream should replicate data."
+                                              schema:
+                                                type: string
+                                                default: ""
+                                            - variable: LITESTREAM_ENDPOINT
+                                              label: "LightStream Endpoint"
+                                              description: "Compatible cloud storage endpoint where Litestream should replicate data."
+                                              schema:
+                                                type: string
+                                                default: ""
+                                            - variable: LITESTREAM_ACCESS_KEY_ID
+                                              label: "LightStream Access Key Id"
+                                              description: "Compatible cloud storage access key ID to the bucket where you want to replicate data."
+                                              schema:
+                                                type: string
+                                                private: true
+                                                default: ""
+                                            - variable: LITESTREAM_SECRET_ACCESS_KEY
+                                              label: "LightStream Secret Access Key"
+                                              description: "Compatible cloud storage secret access key to the bucket where you want to replicate data."
+                                              schema:
+                                                type: string
+                                                private: true
+                                                default: ""
+                                            - variable: LITESTREAM_RETENTION
+                                              label: "LightStream Retention"
+                                              description: "The amount of time Litestream snapshots & WAL files will be kept."
+                                              schema:
+                                                type: string
+                                                required: true
+                                                default: "72h"
 # Include{containerBasic}
 # Include{containerAdvanced}
 
diff --git a/charts/stable/picoshare/values.yaml b/charts/stable/picoshare/values.yaml
index b8c5d64a30f..c1cc360c6b2 100644
--- a/charts/stable/picoshare/values.yaml
+++ b/charts/stable/picoshare/values.yaml
@@ -2,18 +2,12 @@ image:
   repository: tccr.io/truecharts/picoshare
   tag: v1.3.8@sha256:b88b39d24ef5f6ed5f1055bb8d607e395a9eb037d2eaaeb1c0f9ca4165d4447b
   pullPolicy: IfNotPresent
+
 service:
   main:
     ports:
       main:
         port: 10209
-persistence:
-  data:
-    enabled: true
-    mountPath: "/data"
-portal:
-  open:
-    enabled: true
 
 workload:
   main:
@@ -22,8 +16,20 @@ workload:
         main:
           env:
             PORT: "{{ .Values.service.main.ports.main.port }}"
+            # web admin password
             PS_SHARED_SECRET: "somesecretcode"
+            # optional
             LITESTREAM_BUCKET: ""
             LITESTREAM_ENDPOINT: ""
             LITESTREAM_ACCESS_KEY_ID: ""
             LITESTREAM_SECRET_ACCESS_KEY: ""
+            LITESTREAM_RETENTION: 72h
+
+persistence:
+  data:
+    enabled: true
+    mountPath: "/data"
+
+portal:
+  open:
+    enabled: true