diff --git a/basic/apps/do-test/kustomization.yaml b/basic/apps/do-test/kustomization.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4aa48ff803106503f64443cd7b061917588c6e2f
--- /dev/null
+++ b/basic/apps/do-test/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - vikunja-oauth-client.yaml
+  - vikunja-release.yaml
+  - vikunja-values-configmap.yaml
+  - vikunja-postgres-pvc.yaml
diff --git a/basic/apps/do-test/vikunja-values-configmap.yaml b/basic/apps/do-test/vikunja-values-configmap.yaml
index a55565a891d72646f5ca06bcf614e1cad32ac337..422c86b9ddb6b4b3ed741152e1294062eb82fce7 100644
--- a/basic/apps/do-test/vikunja-values-configmap.yaml
+++ b/basic/apps/do-test/vikunja-values-configmap.yaml
@@ -9,10 +9,10 @@ data:
   values.yaml: |
     additionalContainers:
       api:
-        image: vikunja/api:0.18.1
+        image: vikunja/api:unstable
         imagePullPolicy: Always
       frontend:
-        image: vikunja/frontend:0.18.2
+        image: vikunja/frontend:unstable
         imagePullPolicy: Always
     vikunja:
       config: |-
diff --git a/basic/apps/people/suitecrm-values-configmap.yaml b/basic/apps/people/suitecrm-values-configmap.yaml
index c8a7a9f44bbfdd0382cfad25f30bbc5d43e73ed7..b48b0d8af6078b1f0a056658464c00497157f704 100644
--- a/basic/apps/people/suitecrm-values-configmap.yaml
+++ b/basic/apps/people/suitecrm-values-configmap.yaml
@@ -13,7 +13,7 @@ data:
       certManager: true
     suitecrmUsername: "admin"
     suitecrmEmail: "${admin_email}"
-    suitecrmPassword: "${suitecrm_password}"
+    suitecrmPassword: "${password}"
     mariadb:
       auth:
         password: "${mariadb_password}"
diff --git a/basic/apps/time/kimai-values-configmap.yaml b/basic/apps/time/kimai-values-configmap.yaml
index 875c97b0ad041004c82e1eaf367e551ad9b81492..9a271c0b617ee9bfb1b9e50ef9aebbbcb9671f12 100644
--- a/basic/apps/time/kimai-values-configmap.yaml
+++ b/basic/apps/time/kimai-values-configmap.yaml
@@ -7,13 +7,23 @@ data:
   values.yaml: |
     # https://github.com/robjuz/helm-charts/tree/master/charts/kimai2#parameters
     image:
-      # Maybe apache-latest?
-      tag: apache-1.20.4-prod
+      tag: apache-1.21.0-prod
+    kimaiAppSecret: "${secret}"
+    kimaiAdminEmail: "${admin_email}"
+    kimaiAdminPassword: "${password}"
+    kimaiMailerUrl: "smtp://${outgoing_mail_smtp_user}:${outgoing_mail_smtp_password}@${outgoing_mail_smtp_host}?encryption=tls&auth_mode=plain"
+    kimaiMailerFrom: "${outgoing_mail_from_address}"
     ingress:
       enabled: true
       certManager: true
       tls: true
       hostname: "time.${domain}"
+    persistence:
+      existingClaim: kimai-data
+    mariadb:
+      auth:
+        password: "${mariadb_password}"
+        rootPassword: "${mariadb_root_password}"
     #    - name: Stackspin
     #      key: "${client_id}"
     #      secret: "${client_secret}"
diff --git a/basic/apps/time/kustomization.yaml b/basic/apps/time/kustomization.yaml
index ba38c454374544e7b649ef15e109470ccea0a69c..c7992917970681e9b0b4192eb2e726d4f94c2181 100644
--- a/basic/apps/time/kustomization.yaml
+++ b/basic/apps/time/kustomization.yaml
@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - kimai-release.yaml
+  - pvc.yaml
   - kimai-values-configmap.yaml
diff --git a/basic/apps/time/pvc.yaml b/basic/apps/time/pvc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..efc0ded13dbc8369e7896fb0e41fe7d7d3b11679
--- /dev/null
+++ b/basic/apps/time/pvc.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: kimai-data
+  namespace: stackspout
+  labels:
+    stackspin.net/backupSet: "kimai"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: local-path
diff --git a/basic/install.sh b/basic/install.sh
index 09e35b8b00182aa1def56c10af46a3af680480e8..1e8eed0de1388d0b347f163b6d197191dad97ce3 100755
--- a/basic/install.sh
+++ b/basic/install.sh
@@ -19,3 +19,4 @@ python $(dirname "$0")/../generate_secrets.py vikunja
 python $(dirname "$0")/../generate_secrets.py vikunja-test
 python $(dirname "$0")/../generate_secrets.py gitea
 python $(dirname "$0")/../generate_secrets.py suitecrm
+python $(dirname "$0")/../generate_secrets.py kimai
diff --git a/templates/stackspin-kimai-variables.yaml.jinja b/templates/stackspin-kimai-variables.yaml.jinja
new file mode 100644
index 0000000000000000000000000000000000000000..86fd0fd14fa95956fdeeccdd8d83e5f062294935
--- /dev/null
+++ b/templates/stackspin-kimai-variables.yaml.jinja
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: stackspin-suitecrm-variables
+data:
+  password: "{{ 32 | generate_password | b64encode }}"
+  secret: "{{ 32 | generate_password | b64encode }}"
+  mariadb_password: "{{ 32 | generate_password | b64encode }}"
+  mariadb_root_password: "{{ 32 | generate_password | b64encode }}"
diff --git a/templates/stackspin-suitecrm-variables.yaml.jinja b/templates/stackspin-suitecrm-variables.yaml.jinja
index eb1a66e81673542c8353b40d4b861d1a251c3ac5..06651dd0e7863d2483e54c41871783f500910bdb 100644
--- a/templates/stackspin-suitecrm-variables.yaml.jinja
+++ b/templates/stackspin-suitecrm-variables.yaml.jinja
@@ -3,6 +3,6 @@ kind: Secret
 metadata:
   name: stackspin-suitecrm-variables
 data:
-  suitecrm_password: "{{ 32 | generate_password | b64encode }}"
+  password: "{{ 32 | generate_password | b64encode }}"
   mariadb_password: "{{ 32 | generate_password | b64encode }}"
   mariadb_root_password: "{{ 32 | generate_password | b64encode }}"