diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml
index 9023a7ddf51..d53d0b73b50 100644
--- a/charts/stable/paperless-ng/questions.yaml
+++ b/charts/stable/paperless-ng/questions.yaml
@@ -205,8 +205,8 @@ questions:
     schema:
       type: dict
       attrs:
-        - variable: config
-          label: "App Config Storage"
+        - variable: data
+          label: "App Data Storage"
           description: "This is where paperless stores all its data (search index, classification model, etc)"
           schema:
             type: dict
@@ -290,7 +290,7 @@ questions:
                       description: "Memory"
 # Include{persistenceAdvanced}
         - variable: consume
-          label: "App Data Storage"
+          label: "To-be consumed Document Storage"
           description: "This where your documents should go to be consumed."
           schema:
             type: dict
@@ -300,7 +300,7 @@ questions:
                 description: "Sets the persistence type, Anything other than PVC could break rollback!"
                 schema:
                   type: string
-                  default: "simpleHP"
+                  default: "simplePVC"
                   enum:
                     - value: "simplePVC"
                       description: "PVC (simple)"
@@ -332,7 +332,7 @@ questions:
                       description: "Memory"
 # Include{persistenceAdvanced}
         - variable: media
-          label: "App Media Storage"
+          label: "App Document Storage"
           description: "This is where your documents and thumbnails are stored."
           schema:
             type: dict
@@ -342,7 +342,7 @@ questions:
                 description: "Sets the persistence type, Anything other than PVC could break rollback!"
                 schema:
                   type: string
-                  default: "simpleHP"
+                  default: "simplePVC"
                   enum:
                     - value: "simplePVC"
                       description: "PVC (simple)"
diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml
index fca22219c35..07608956081 100644
--- a/charts/stable/paperless-ng/values.yaml
+++ b/charts/stable/paperless-ng/values.yaml
@@ -18,12 +18,12 @@ secret:
 
 env:
   PUID: 568
-  PAPERLESS_DATA_DIR: "/config/"
+  PAPERLESS_DATA_DIR: "/data/"
   PAPERLESS_STATICDIR: "/static/"
   PAPERLESS_CONSUMPTION_DIR: "/consume/"
   PAPERLESS_MEDIA_ROOT: "/media/"
   USERMAP_UID: "{{ .Values.env.PUID }}"
-  USERMAP_GID: "{{ .Values.env.PGID }}"
+  USERMAP_GID: "{{ .Values.podSecurityContext.fsGroup }}"
   PAPERLESS_TIME_ZONE: "{{ .Values.env.TZ }}"
   PAPERLESS_DBNAME: "{{ .Values.postgresql.postgresqlDatabase }}"
   PAPERLESS_DBUSER: "{{ .Values.postgresql.postgresqlUsername }}"
@@ -55,9 +55,9 @@ service:
         port: 10140
 
 persistence:
-  config:
+  data:
     enabled: true
-    mountPath: "/config"
+    mountPath: "/data"
   consume:
     enabled: true
     mountPath: "/consume"
@@ -71,7 +71,7 @@ persistence:
 redis:
   enabled: true
   existingSecret: "rediscreds"
-  redisUsername: paperless-ng
+  redisUsername: default
 
 postgresql:
   enabled: true