diff --git a/basic/apps/do-test/vikunja-release.yaml b/basic/apps/do-test/vikunja-release.yaml
index 493638f7be3b7a8a95d887e5b09fa3b5d162369d..9b033c28d33b0a807c743452edd76d3e785b319a 100644
--- a/basic/apps/do-test/vikunja-release.yaml
+++ b/basic/apps/do-test/vikunja-release.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: vikunja
-      version: 3.0.49
+      version: 6.0.22
       sourceRef:
         kind: HelmRepository
         name: truecharts
diff --git a/basic/apps/do-test/vikunja-values-configmap.yaml b/basic/apps/do-test/vikunja-values-configmap.yaml
index ea88ee702011a45113a82d3edc58fccd99d7a0a3..e79c2d9451c02ee7e2c6b96fe872d2925bf0e69b 100644
--- a/basic/apps/do-test/vikunja-values-configmap.yaml
+++ b/basic/apps/do-test/vikunja-values-configmap.yaml
@@ -6,39 +6,41 @@ metadata:
 data:
   # https://github.com/truecharts/charts/blob/master/charts/stable/vikunja/values.yaml
   values.yaml: |
-    #image:
-    #  tag: unstable
-    #  imagePullPolicy: Always
-    #frontendImage:
-    #  tag: unstable
-    #  imagePullPolicy: Always
-    vikunja:
-      config: |-
-        auth:
-          openid:
-            # https://vikunja.io/docs/config-options/#openid
-            # Example: https://github.com/go-vikunja/api/blob/main/config.yml.sample#L289-L312
-            enabled: true
-            redirecturl: "https://do-test.${domain}/auth/openid/"
-            providers:
-              - name: Stackspin
-                authurl: "https://sso.${domain}/"
-                clientid: "${client_id}"
-                clientsecret: "${client_secret}"
-        service:
-          frontendurl: "https://do-test.${domain}"
-          motd: "This is a test instance, do not use for production data as it can vanish without notice! Use Stackspin login, as usual."
-          timezone: "CET"
-          JWTSecret: "${jwt}"
-        database:
-          type: postgres
-          host: vikunja-test-postgresql
-          password: "${postgresql_password}"
-        log:
-          path: "/app/vikunja"
-          http: stdout
-          database: stderr
-          databaselevel: debug
+    image:
+      tag: unstable
+      imagePullPolicy: Always
+    frontendImage:
+      tag: unstable
+      imagePullPolicy: Always
+    configmap:
+      config:
+        data:
+          vikunja.yaml: |-
+            auth:
+              openid:
+                # https://vikunja.io/docs/config-options/#openid
+                # Example: https://github.com/go-vikunja/api/blob/main/config.yml.sample#L289-L312
+                enabled: true
+                redirecturl: "https://do-test.${domain}/auth/openid/"
+                providers:
+                  - name: Stackspin
+                    authurl: "https://sso.${domain}/"
+                    clientid: "${client_id}"
+                    clientsecret: "${client_secret}"
+            service:
+              frontendurl: "https://do-test.${domain}"
+              motd: "This is a test instance, do not use for production data as it can vanish without notice! Use Stackspin login, as usual."
+              timezone: "CET"
+              JWTSecret: "${jwt}"
+            database:
+              type: postgres
+              host: vikunja-test-postgresql
+              password: "${postgresql_password}"
+            log:
+              path: "/app/vikunja"
+              http: stdout
+              database: stderr
+              databaselevel: debug
     ingress:
       main:
         enabled: true