diff --git a/templates/questions/persistence/persistenceBasic.yaml b/templates/questions/persistence/persistenceBasic.yaml
index b0aacec9788..768fbb0ccd5 100644
--- a/templates/questions/persistence/persistenceBasic.yaml
+++ b/templates/questions/persistence/persistenceBasic.yaml
@@ -92,3 +92,30 @@
                   show_if: [["type", "=", "pvc"]]
                   type: string
                   default: 256Gi
+              - variable: volumeSnapshots
+                label: Volume Snapshots (Experimental)
+                description: Add an entry to the list to force creation of a volumeSnapshot of this PVC
+                schema:
+                  show_if: [["type", "=", "pvc"]]
+                  type: list
+                  default: []
+                  items:
+                    - variable: volumeSnapshotEntry
+                      label: Custom volumeSnapshot
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: name
+                            label: Name
+                            description: WARNING: renaming this, means deletion of the snapshot with the old name!
+                            schema:
+                              type: string
+                              default: "mysnapshot"
+                              required: true
+                          - variable: volumeSnapshotClassName
+                            label: volumeSnapshot Class Name (Advanced)
+                            description: For use with PVCs using a non-default storageClass
+                            schema:
+                              type: string
+                              default: ""
diff --git a/templates/questions/persistence/persistenceList.yaml b/templates/questions/persistence/persistenceList.yaml
index a62b023d885..0114bb888a9 100644
--- a/templates/questions/persistence/persistenceList.yaml
+++ b/templates/questions/persistence/persistenceList.yaml
@@ -118,3 +118,30 @@
                   show_if: [["type", "=", "pvc"]]
                   type: string
                   default: 256Gi
+              - variable: volumeSnapshots
+                label: Volume Snapshots (Experimental)
+                description: Add an entry to the list to force creation of a volumeSnapshot of this PVC
+                schema:
+                  show_if: [["type", "=", "pvc"]]
+                  type: list
+                  default: []
+                  items:
+                    - variable: volumeSnapshotEntry
+                      label: Custom volumeSnapshot
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: name
+                            label: Name
+                            description: WARNING: renaming this, means deletion of the snapshot with the old name!
+                            schema:
+                              type: string
+                              default: "mysnapshot"
+                              required: true
+                          - variable: volumeSnapshotClassName
+                            label: volumeSnapshot Class Name (Advanced)
+                            description: For use with PVCs using a non-default storageClass
+                            schema:
+                              type: string
+                              default: ""