diff --git a/basic/apps/do/vikunja-values-configmap.yaml b/basic/apps/do/vikunja-values-configmap.yaml
index acbcd12..d301a71 100644
--- a/basic/apps/do/vikunja-values-configmap.yaml
+++ b/basic/apps/do/vikunja-values-configmap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: stackspin-vikunja-values
+  name: stackspin-{{ .Release.Name }}-values
   namespace: stackspout
 data:
   # Defaults: https://github.com/k8s-at-home/charts/blob/master/charts/stable/vikunja/values.yaml
@@ -27,9 +27,9 @@ data:
           motd: "Please allow public profile discovery in settings!"
           timezone: "CET"
         database:
-          host: db
           type: postgres
-          password: "${postgres_password}"
+          host: {{ .Release.Name }}-postgresql
+          password: "${postgresql_password}"
     ingress:
       main:
         enabled: true
@@ -42,7 +42,7 @@ data:
                - path: /
                  pathType: Prefix
         tls:
-          - secretName: vikunja-tls
+          - secretName: {{ .Release.Name }}-tls
             hosts:
               - "do.${domain}"
     additionalContainers:
@@ -52,9 +52,9 @@ data:
         image: vikunja/frontend:0.18.2
     postgresql:
       enabled: true
-      postgresqlUsername: vikunja
-      postgresqlPassword: "${postgres_password}"
-      postgresqlDatabase: vikunja
+      postgresqlDatabase: {{ .Release.Name }}
+      postgresqlUsername: {{ .Release.Name }}
+      postgresqlPassword: "${postgresql_password}"
       persistence:
         enabled: true
-        existingClaim: vikunja-postgres
+        existingClaim: {{ .Release.Name }}-postgres
diff --git a/templates/stackspin-vikunja-variables.yaml.jinja b/templates/stackspin-vikunja-variables.yaml.jinja
index f0d182e..10e0434 100644
--- a/templates/stackspin-vikunja-variables.yaml.jinja
+++ b/templates/stackspin-vikunja-variables.yaml.jinja
@@ -3,4 +3,4 @@ kind: Secret
 metadata:
   name: stackspin-vikunja-variables
 data:
-  postgres_password: "{{ 32 | generate_password | b64encode }}"
+  postgresql_password: "{{ 32 | generate_password | b64encode }}"