diff --git a/blueprints/vikunja/docker-compose.yml b/blueprints/vikunja/docker-compose.yml
index 11b744b01..0d1c7fbef 100644
--- a/blueprints/vikunja/docker-compose.yml
+++ b/blueprints/vikunja/docker-compose.yml
@@ -1,17 +1,17 @@
-version: "3.8"
-
 services:
   vikunja:
     image: vikunja/vikunja
+    user: "0:0"
     environment:
-      VIKUNJA_SERVICE_PUBLICURL: http://vikunja.local
-      VIKUNJA_DATABASE_HOST: db
+      VIKUNJA_SERVICE_PUBLICURL: ${VIKUNJA_SERVICE_PUBLICURL}
+      VIKUNJA_PUBLIC_PORT: ${VIKUNJA_PUBLIC_PORT}
+      VIKUNJA_DATABASE_HOST: ${VIKUNJA_DATABASE_HOST}
       VIKUNJA_DATABASE_PASSWORD: ${VIKUNJA_DATABASE_PASSWORD}
-      VIKUNJA_DATABASE_TYPE: postgres
-      VIKUNJA_DATABASE_USER: vikunja
-      VIKUNJA_DATABASE_DATABASE: vikunja
+      VIKUNJA_DATABASE_TYPE: ${VIKUNJA_DATABASE_TYPE}
+      VIKUNJA_DATABASE_USER: ${VIKUNJA_DATABASE_USER}
+      VIKUNJA_DATABASE_DATABASE: ${VIKUNJA_DATABASE_DATABASE}
       VIKUNJA_SERVICE_JWTSECRET: ${VIKUNJA_SERVICE_JWTSECRET}
-    expose:
+    ports:
       - 3456
     volumes:
       - vikunja-files:/app/vikunja/files
@@ -24,15 +24,16 @@ services:
     image: postgres:17
     environment:
       POSTGRES_PASSWORD: ${VIKUNJA_DATABASE_PASSWORD}
-      POSTGRES_USER: vikunja
-      POSTGRES_DB: vikunja
+      POSTGRES_USER: ${VIKUNJA_DATABASE_USER}
+      POSTGRES_DB: ${VIKUNJA_DATABASE_DATABASE}
     volumes:
       - vikunja-db:/var/lib/postgresql/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -h localhost -U $$POSTGRES_USER"]
-      interval: 2s
-      start_period: 30s
+      test: ["CMD-SHELL", "pg_isready", "-U", "${VIKUNJA_DATABASE_USER}",  "-d", "${VIKUNJA_DATABASE_DATABASE}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
 
 volumes:
   vikunja-files: {}
diff --git a/blueprints/vikunja/template.toml b/blueprints/vikunja/template.toml
index 0a4e88f92..1740d3e69 100644
--- a/blueprints/vikunja/template.toml
+++ b/blueprints/vikunja/template.toml
@@ -18,10 +18,6 @@ VIKUNJA_DATABASE_USER = "vikunja"
 VIKUNJA_DATABASE_DATABASE = "vikunja"
 VIKUNJA_SERVICE_JWTSECRET = "${jwt_secret}"
 
-POSTGRES_PASSWORD = "${db_password}"
-POSTGRES_USER = "vikunja"
-POSTGRES_DB = "vikunja"
-
 [[config.mounts]]
 serviceName = "vikunja"
 volumeName = "vikunja-files"
diff --git a/meta.json b/meta.json
index 12173567a..6dff3a413 100644
--- a/meta.json
+++ b/meta.json
@@ -6232,7 +6232,7 @@
     "description": "Vikunja is a self-hosted, open-source to-do list application to organize tasks, projects, and notes.",
     "logo": "image.png",
     "links": {
-      "github": "https://kolaente.dev/vikunja/",
+      "github": "https://github.com/go-vikunja/vikunja",
       "website": "https://vikunja.io/",
       "docs": "https://vikunja.io/docs/"
     },