diff --git a/library/ix-dev/community/vikunja/templates/_postgres.tpl b/library/ix-dev/community/vikunja/templates/_postgres.tpl
new file mode 100644
index 0000000000..cf1238d8b0
--- /dev/null
+++ b/library/ix-dev/community/vikunja/templates/_postgres.tpl
@@ -0,0 +1,6 @@
+{{- define "vikunja.postgres" -}}
+workload:
+{{- include "ix.v1.common.app.postgres" (dict "secretName" "postgres-creds"
+                                              "resources" .Values.resources
+                                              "ixChartContext" .Values.ixChartContext) | nindent 2 }}
+{{- end -}}
diff --git a/library/ix-dev/community/vikunja/templates/_redis.tpl b/library/ix-dev/community/vikunja/templates/_redis.tpl
new file mode 100644
index 0000000000..23d8d6f7f6
--- /dev/null
+++ b/library/ix-dev/community/vikunja/templates/_redis.tpl
@@ -0,0 +1,6 @@
+{{- define "rvikunja.redis" -}}
+workload:
+{{- include "ix.v1.common.app.redis" (dict  "secretName" "redis-creds"
+                                            "resources" .Values.resources) | nindent 2 }}
+
+{{- end -}}
diff --git a/library/ix-dev/community/vikunja/templates/_service.tpl b/library/ix-dev/community/vikunja/templates/_service.tpl
new file mode 100644
index 0000000000..f3263c1d21
--- /dev/null
+++ b/library/ix-dev/community/vikunja/templates/_service.tpl
@@ -0,0 +1,27 @@
+{{- define "vikunja.service" -}}
+service:
+  vikunja:
+    enabled: true
+    primary: true
+    type: NodePort
+    targetSelector: vikunja
+    ports:
+      webui:
+        enabled: true
+        primary: true
+        port: {{ .Values.vikunjaNetwork.webPort }}
+        nodePort: {{ .Values.vikunjaNetwork.webPort }}
+        targetSelector: vikunja
+  redis:
+    enabled: true
+    type: ClusterIP
+    targetSelector: redis
+    ports:
+      redis:
+        enabled: true
+        primary: true
+        port: 6379
+        targetPort: 6379
+        targetSelector: redis
+  {{- include "ix.v1.common.app.postgresService" $ | nindent 2 }}
+{{- end -}}
diff --git a/library/ix-dev/community/vikunja/upgrade_info.json b/library/ix-dev/community/vikunja/upgrade_info.json
index d2f2119c4e..d3839b2d58 100644
--- a/library/ix-dev/community/vikunja/upgrade_info.json
+++ b/library/ix-dev/community/vikunja/upgrade_info.json
@@ -1 +1 @@
-{ "filename": "values.yaml", "keys": ["image", "apiImage", "nginxImage"] }
+{ "filename": "values.yaml", "keys": ["image", "frontendImage", "nginxImage"] }
diff --git a/library/ix-dev/community/vikunja/upgrade_strategy b/library/ix-dev/community/vikunja/upgrade_strategy
index 674fc06dfc..1633b216e9 100755
--- a/library/ix-dev/community/vikunja/upgrade_strategy
+++ b/library/ix-dev/community/vikunja/upgrade_strategy
@@ -11,7 +11,7 @@ ENUMS = {
     'image': {
         'RE_STABLE_VERSION': RE_STABLE_VERSION,
     },
-    'apiImage': {
+    'frontendImage': {
         'RE_STABLE_VERSION': RE_STABLE_VERSION,
     },
     'nginxImage': {