diff --git a/apps/do-kustomization.yaml b/apps/do-kustomization.yaml
new file mode 100644
index 0000000..24e3fc4
--- /dev/null
+++ b/apps/do-kustomization.yaml
@@ -0,0 +1,12 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: add-do
+  namespace: flux-system
+spec:
+  interval: 10m
+  prune: true
+  path: ./apps/do
+  sourceRef:
+    kind: GitRepository
+    name: stackspout
diff --git a/apps/do/kustomization.yaml b/apps/do/kustomization.yaml
new file mode 100644
index 0000000..1f17556
--- /dev/null
+++ b/apps/do/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - vikunja-kustomization.yaml
+  - vikunja-secrets-kustomization.yaml
diff --git a/apps/do/vikunja-kustomization.yaml b/apps/do/vikunja-kustomization.yaml
index 332d5bc..3010be5 100644
--- a/apps/do/vikunja-kustomization.yaml
+++ b/apps/do/vikunja-kustomization.yaml
@@ -1,26 +1,34 @@
-
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: vikunja
   namespace: flux-system
 spec:
-  interval: 10m
+  interval: 5m
   retryInterval: 2m
+  timeout: 10m
   wait: true
-  timeout: 3m
-  dependsOn:
-    - name: single-sign-on
+  prune: true
+  path: ./apps/do/vikunja
   sourceRef:
     kind: GitRepository
     name: stackspout
-  path: ./apps/do
-  prune: true
+  dependsOn:
+    - name: flux
+    - name: local-path-provisioner
+    - name: vikunja-secrets
+    - name: nginx
+    - name: single-sign-on
   postBuild:
     substituteFrom:
       - kind: Secret
-        name: stackspin-vikunja-variables
+        name: stackspin-cluster-variables
+      - kind: ConfigMap
+        name: stackspin-vikunja-kustomization-variables
+      - kind: Secret
+        name: stackspout-vikunja-variables
+      # OIDC
       - kind: Secret
         name: stackspin-vikunja-oauth-variables
-      - kind: Secret
-        name: stackspin-cluster-variables
+      - kind: ConfigMap
+        name: stackspin-single-sign-on-kustomization-variables
diff --git a/apps/do/vikunja-secrets-kustomization.yaml b/apps/do/vikunja-secrets-kustomization.yaml
new file mode 100644
index 0000000..17ff62c
--- /dev/null
+++ b/apps/do/vikunja-secrets-kustomization.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: vikunja-secrets
+  namespace: flux-system
+spec:
+  interval: 5m
+  timeout: 4m
+  wait: true
+  prune: true
+  path: ./apps/do/vikunja-secrets
+  sourceRef:
+    kind: GitRepository
+    name: stackspout
+  dependsOn:
+    - name: flux
+    - name: secrets-controller
diff --git a/apps/do/vikunja-secrets/vikunja-kustomization-variables.yaml b/apps/do/vikunja-secrets/vikunja-kustomization-variables.yaml
new file mode 100644
index 0000000..f759ca9
--- /dev/null
+++ b/apps/do/vikunja-secrets/vikunja-kustomization-variables.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: stackspin-vikunja-kustomization-variables
+  namespace: flux-system
+data:
+  vikunja_domain: do.${domain}
diff --git a/apps/do/vikunja-secrets/vikunja-oauth-secret.yaml b/apps/do/vikunja-secrets/vikunja-oauth-secret.yaml
new file mode 100644
index 0000000..4dd39cf
--- /dev/null
+++ b/apps/do/vikunja-secrets/vikunja-oauth-secret.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: secretgenerator.mittwald.de/v1alpha1
+kind: StringSecret
+metadata:
+  name: stackspin-vikunja-oauth-variables
+  namespace: flux-system
+spec:
+  data:
+    client_id: vikunja
+  fields:
+  - fieldName: client_secret
+    length: "32"
diff --git a/apps/do/vikunja/vikunja-release.yaml b/apps/do/vikunja/vikunja-release.yaml
index 46b6d63..fef4da5 100644
--- a/apps/do/vikunja/vikunja-release.yaml
+++ b/apps/do/vikunja/vikunja-release.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: vikunja
-      version: 0.4.1
+      version: 0.4.2
       sourceRef:
         kind: HelmRepository
         name: vikunja
diff --git a/apps/do/vikunja/vikunja-values-configmap.yaml b/apps/do/vikunja/vikunja-values-configmap.yaml
index d680733..76650ba 100644
--- a/apps/do/vikunja/vikunja-values-configmap.yaml
+++ b/apps/do/vikunja/vikunja-values-configmap.yaml
@@ -4,7 +4,7 @@ metadata:
   name: stackspin-vikunja-values
   namespace: stackspout
 data:
-  # https://github.com/truecharts/charts/blob/master/charts/stable/vikunja/values.yaml
+  # https://kolaente.dev/vikunja/helm-chart/src/branch/main/values.yaml
   values.yaml: |
     frontend:
       image:
@@ -24,6 +24,9 @@ data:
               hosts:
                 - "do.${domain}"
     api:
+      persistence:
+        data:
+          existingClaim: vikunja-files
       image:
         tag: unstable
         pullPolicy: Always
@@ -86,10 +89,13 @@ data:
                 week_start: 1
                 timezone: CET
                 # TODO default_project_id
-    #persistence:
-    #  files:
-    #    labels:
-    #      stackspin.net/backupSet: "vikunja"
+    global:
+      labels:
+        stackspin.net/backupSet: "vikunja"
+    podLabels:
+      stackspin.net/backupSet: "vikunja"
+    podAnnotations:
+      backup.velero.io/backup-volumes: "data"
     postgresql:
       enabled: true
       global: