diff --git a/charts/stable/etherpad/Chart.yaml b/charts/stable/etherpad/Chart.yaml
index 5e85c646fc4..d16a8a669ea 100644
--- a/charts/stable/etherpad/Chart.yaml
+++ b/charts/stable/etherpad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 appVersion: "1.8.14"
-version: 8.0.28
+version: 8.0.29
 kubeVersion: ">=1.16.0-0"
 name: etherpad
 description: A real-time collaborative editor scalable to thousands of simultaneous real time users.
diff --git a/charts/stable/etherpad/questions.yaml b/charts/stable/etherpad/questions.yaml
index 2d9fc7f002d..cc56a458586 100644
--- a/charts/stable/etherpad/questions.yaml
+++ b/charts/stable/etherpad/questions.yaml
@@ -12,6 +12,52 @@ questions:
 # Include{recreate}
 # Include{controllerExpert}
 # Include{controllerExpertExtraArgs}
+  - variable: secretEnv
+    group: "Container Configuration"
+    label: "Image Secrets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: ADMIN_PASSWORD
+          label: "Admin Password"
+          description: "The password for the admin user (leave unspecified if you do not want to create it)"
+          schema:
+            type: string
+            private: true
+            default: ""
+        - variable: USER_PASSWORD
+          label: "User Password"
+          description: "The password for the first user user (leave unspecified if you do not want to create it)"
+          schema:
+            type: string
+            private: true
+            default: ""
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: TITLE
+          label: "Title"
+          description: "The name of the instance"
+          schema:
+            type: string
+            default: "Etherpad"
+        - variable: FAVICON
+          label: "Favicon"
+          description: "Favicon default name, or a fully specified URL to your own favicon"
+          schema:
+            type: string
+            default: "favicon.ico"
+        - variable: DEFAULT_PAD_TEXT
+          label: "Default Pad Text"
+          description: "The default text of a pad"
+          schema:
+            type: string
+            default: "Welcome to Etherpad! This pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents! Get involved with Etherpad at https://etherpad.org"
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/stable/etherpad/values.yaml b/charts/stable/etherpad/values.yaml
index 21eb2e08f09..8840fc70ebe 100644
--- a/charts/stable/etherpad/values.yaml
+++ b/charts/stable/etherpad/values.yaml
@@ -3,6 +3,10 @@ image:
   pullPolicy: IfNotPresent
   tag: version-1.8.14@sha256:4900f0e787ca22cf93090ae44ecceb5689d4427c739e1eb637a6e3a913161bf8
 
+secretEnv:
+  ADMIN_PASSWORD: "adminpass"
+  USER_PASSWORD: "firstuserpass"
+
 env:
   DB_TYPE: "postgres"
   DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
@@ -16,6 +20,10 @@ env:
     secretKeyRef:
       name: dbcreds
       key: plainhost
+  # User Defined
+  TITLE: "Etherpad"
+  FAVICON: "favicon.ico"
+  DEFAULT_PAD_TEXT: "Welcome to Etherpad! This pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents! Get involved with Etherpad at https://etherpad.org"
 
 securityContext:
   readOnlyRootFilesystem: false