diff --git a/charts/stable/timetagger/Chart.yaml b/charts/stable/timetagger/Chart.yaml
index 0202f80ef6e..6cae016fb24 100644
--- a/charts/stable/timetagger/Chart.yaml
+++ b/charts/stable/timetagger/Chart.yaml
@@ -35,4 +35,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/timetagger
   - https://ghcr.io/almarklein/timetagger
 type: application
-version: 5.2.0
+version: 6.0.0
diff --git a/charts/stable/timetagger/docs/Install.md b/charts/stable/timetagger/docs/Install.md
new file mode 100644
index 00000000000..f3eace43539
--- /dev/null
+++ b/charts/stable/timetagger/docs/Install.md
@@ -0,0 +1,6 @@
+# Credential Generation Basic Auth
+  
+To Setup Credentials for Basic Authg proceed to <https://timetagger.app/cred> and enter the user name and password you wish to use  
+  
+You may then copy the Last sectionfrom the output entited "Double dollar signs, for docker-compose scrip" and place it in to the Credential field for Basic Auth. this should set your user name and password  
+![Example](./img/image.png)
diff --git a/charts/stable/timetagger/docs/img/image.png b/charts/stable/timetagger/docs/img/image.png
new file mode 100644
index 00000000000..607f79a79b0
Binary files /dev/null and b/charts/stable/timetagger/docs/img/image.png differ
diff --git a/charts/stable/timetagger/questions.yaml b/charts/stable/timetagger/questions.yaml
index 38b3f17aeed..3cf86463f5e 100644
--- a/charts/stable/timetagger/questions.yaml
+++ b/charts/stable/timetagger/questions.yaml
@@ -15,19 +15,32 @@ questions:
                                     additional_attrs: true
                                     type: dict
                                     attrs:
-                                      - variable: tg_user
-                                        label: "Username"
+                                      - variable: TIMETAGGER_CREDENTIALS
+                                        label: "Basic Auth User/Pass"
+                                        description: "Generate at https://timetagger.app/cred"
                                         schema:
                                           type: string
                                           default: ""
-                                          required: true
-                                      - variable: tg_pass
-                                        label: "Password"
+                                          required: false
+                                      - variable: TIMETAGGER_PROXY_AUTH_ENABLED
+                                        label: "Enable Proxy Auth"
+                                        schema:
+                                          type: string
+                                          default: "false"
+                                          required: false
+                                      - variable: TIMETAGGER_PROXY_AUTH_TRUSTED
+                                        label: "Trusted Proxy"
                                         schema:
                                           type: string
                                           default: ""
-                                          required: true
-                                          private: true
+                                          show_if: [[TIMETAGGER_PROXY_AUTH_ENABLED, "=", "true"]]
+                                      - variable: TIMETAGGER_PROXY_AUTH_HEADER
+                                        label: "Header"
+                                        schema:
+                                          type: string
+                                          default: "X-Remote-User"
+                                          required: false
+                                          show_if: [[TIMETAGGER_PROXY_AUTH_ENABLED, "=", "true"]]
                                       - variable: TIMETAGGER_LOG_LEVEL
                                         label: "TIMETAGGER_LOG_LEVEL"
                                         schema:
@@ -89,13 +102,13 @@ questions:
                 description: "The UserID of the user running the application"
                 schema:
                   type: int
-                  default: 568
+                  default: 1000
               - variable: fsGroup
                 label: "fsGroup"
                 description: "The group that should own ALL storage."
                 schema:
                   type: int
-                  default: 568
+                  default: 1000
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
diff --git a/charts/stable/timetagger/values.yaml b/charts/stable/timetagger/values.yaml
index 26985bc80f5..c2d4cc89690 100644
--- a/charts/stable/timetagger/values.yaml
+++ b/charts/stable/timetagger/values.yaml
@@ -1,19 +1,19 @@
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/almarklein/timetagger
-  tag: v23.11.4@sha256:df703a7d2a155bbaac27ffa01f42323645798a5dbb3ee1eccd6e050e7c501e53
+  tag: v23.11.4-nonroot@sha256:0ee74428c5859cb237a04f6cd0aa6f30b73bc80fa6cedb7b8116c63b8907ed6c
 persistence:
   config:
     enabled: true
-    mountPath: /root/_timetagger
+    mountPath: /opt/_timetagger
 portal:
   open:
     enabled: true
 securityContext:
   container:
     readOnlyRootFilesystem: false
-    runAsGroup: 0
-    runAsUser: 0
+    runAsGroup: 1000
+    runAsUser: 1000
 service:
   main:
     ports:
@@ -26,9 +26,4 @@ workload:
         main:
           env:
             TIMETAGGER_BIND: 0.0.0.0:{{ .Values.service.main.ports.main.port }}
-            TIMETAGGER_CREDENTIALS:
-              "{{ htpasswd .Values.workload.main.podSpec.containers.main.env.tg_user .Values.workload.main.podSpec.containers.main.env.tg_pass
-              }}"
-            TIMETAGGER_LOG_LEVEL: info
-            tg_pass: changeme
-            tg_user: admin
+