diff --git a/charts/incubator/kopia/Chart.yaml b/charts/incubator/kopia/Chart.yaml
index b66568c47e6..dcfa8416de2 100644
--- a/charts/incubator/kopia/Chart.yaml
+++ b/charts/incubator/kopia/Chart.yaml
@@ -19,7 +19,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/kopia
   - https://kopia.io/docs/installation/#docker-images
   - https://github.com/kopia/kopia
-version: 6.0.4
+version: 6.0.5
 annotations:
   truecharts.org/catagories: |
     - utility
diff --git a/charts/incubator/kopia/questions.yaml b/charts/incubator/kopia/questions.yaml
index ec62aac2dc7..c8031adc461 100644
--- a/charts/incubator/kopia/questions.yaml
+++ b/charts/incubator/kopia/questions.yaml
@@ -12,42 +12,38 @@ questions:
 # Include{containerMain}
 
                                 - variable: kopia
-                                  group: "App Configuration"
-                                  label: "Image Environment"
+                                  group: App Configuration
+                                  label: Kopia Configuration
                                   schema:
                                     additional_attrs: true
                                     type: dict
                                     attrs:
-                                      - variable: USER
-                                        label: "Kopia User"
-                                        description: "Repository user"
+                                      - variable: user
+                                        label: Repo User
                                         schema:
                                           type: string
-                                          default: "secret"
+                                          default: ""
                                           required: true
-                                      - variable: KOPIA_PASSWORD
-                                        label: "Kopia Password"
-                                        description: "Repository password"
+                                      - variable: password
+                                        label: Repo Password
                                         schema:
                                           type: string
-                                          default: "secret"
-                                          required: true
+                                          default: ""
                                           private: true
-                                      - variable: KOPIA_SERVER_USERNAME
-                                        label: "Kopia Server Username"
-                                        description: "Username for WebUI"
+                                          required: true
+                                      - variable: server_username
+                                        label: Server UserName
                                         schema:
                                           type: string
-                                          default: "server_user"
+                                          default: ""
                                           required: true
-                                      - variable: KOPIA_SERVER_PASSWORD
-                                        label: "Kopia Server Password"
-                                        description: "Password for WebUI"
+                                      - variable: server_password
+                                        label:  Server Password
                                         schema:
                                           type: string
-                                          default: "server_password"
-                                          required: true
+                                          default: ""
                                           private: true
+                                          required: true
 
 # Include{containerBasic}
 # Include{containerAdvanced}
diff --git a/charts/incubator/kopia/templates/_secret.tpl b/charts/incubator/kopia/templates/_secret.tpl
index a9753ada237..2e6a40a02bb 100644
--- a/charts/incubator/kopia/templates/_secret.tpl
+++ b/charts/incubator/kopia/templates/_secret.tpl
@@ -5,6 +5,6 @@ enabled: true
 data:
   USER: {{ .Values.kopia.user | default "user" }}
   KOPIA_PASSWORD: {{ .Values.kopia.password | default "secret" }}
-  KOPIA_SERVER_USERNAME: {{ .Values.kopia.server_password | default "server_user" }}
+  KOPIA_SERVER_USERNAME: {{ .Values.kopia.server_username | default "server_user" }}
   KOPIA_SERVER_PASSWORD: {{ .Values.kopia.server_password | default "server_password" }}
 {{- end }}
diff --git a/charts/incubator/kopia/values.yaml b/charts/incubator/kopia/values.yaml
index 88ee2af9fd8..389f33aa907 100644
--- a/charts/incubator/kopia/values.yaml
+++ b/charts/incubator/kopia/values.yaml
@@ -11,10 +11,10 @@ service:
         port: 10238
 
 kopia:
-  kopia_user: "user"
-  kopia_password: "secret"
-  kopia_server_username: "user"
-  kopia_server_password: "password"
+  user: "user"
+  password: "secret"
+  server_username: "user"
+  server_password: "password"
 
 workload:
   main: