diff --git a/charts/incubator/kopia/Chart.yaml b/charts/incubator/kopia/Chart.yaml
index 203fb215f05..b66568c47e6 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.3
+version: 6.0.4
 annotations:
   truecharts.org/catagories: |
     - utility
diff --git a/charts/incubator/kopia/questions.yaml b/charts/incubator/kopia/questions.yaml
index 3c6168ae978..ec62aac2dc7 100644
--- a/charts/incubator/kopia/questions.yaml
+++ b/charts/incubator/kopia/questions.yaml
@@ -26,7 +26,7 @@ questions:
                                           default: "secret"
                                           required: true
                                       - variable: KOPIA_PASSWORD
-                                        label: "KOPIA_PASSWORD"
+                                        label: "Kopia Password"
                                         description: "Repository password"
                                         schema:
                                           type: string
@@ -34,20 +34,21 @@ questions:
                                           required: true
                                           private: true
                                       - variable: KOPIA_SERVER_USERNAME
-                                        label: "KOPIA_SERVER_USERNAME"
+                                        label: "Kopia Server Username"
                                         description: "Username for WebUI"
                                         schema:
                                           type: string
                                           default: "server_user"
                                           required: true
                                       - variable: KOPIA_SERVER_PASSWORD
-                                        label: "KOPIA_SERVER_PASSWORD"
+                                        label: "Kopia Server Password"
                                         description: "Password for WebUI"
                                         schema:
                                           type: string
                                           default: "server_password"
                                           required: true
                                           private: true
+
 # Include{containerBasic}
 # Include{containerAdvanced}
 # Include{containerConfig}
diff --git a/charts/incubator/kopia/values.yaml b/charts/incubator/kopia/values.yaml
index 367e571c905..88ee2af9fd8 100644
--- a/charts/incubator/kopia/values.yaml
+++ b/charts/incubator/kopia/values.yaml
@@ -3,7 +3,18 @@ image:
   tag: 0.13.0@sha256:72ed1856efdd443be31e23535d24242056639a387587aa3ade5413e75dad0603
   pullPolicy: IfNotPresent
 
+service:
+  main:
+    ports:
+      main:
+        protocol: http
+        port: 10238
 
+kopia:
+  kopia_user: "user"
+  kopia_password: "secret"
+  kopia_server_username: "user"
+  kopia_server_password: "password"
 
 workload:
   main:
@@ -16,7 +27,7 @@ workload:
           args:
             - server
             - start
-            - --address=http://0.0.0.0:10238
+            - --address=http://0.0.0.0:{{ .Values.service.main.ports.main.port }}
             - --insecure
             - --server-username={{ .Values.kopia.server_username }}
             - --server-password={{ .Values.kopia.server_password }}
@@ -28,19 +39,6 @@ workload:
             startup:
               enabled: false
 
-kopia:
-  kopia_user: "user"
-  kopia_password: "secret"
-  kopia_server_username: "user"
-  kopia_server_password: "password"
-
-service:
-  main:
-    ports:
-      main:
-        protocol: http
-        port: 10238
-
 persistence:
   config:
     enabled: true