diff --git a/apps/vikunja/config.json b/apps/vikunja/config.json
index ecc2e3fa7c..d3f9b24742 100644
--- a/apps/vikunja/config.json
+++ b/apps/vikunja/config.json
@@ -3,10 +3,11 @@
   "name": "Vikunja",
   "available": true,
   "exposable": true,
+  "dynamic_config": true,
   "port": 8135,
   "id": "vikunja",
   "categories": ["utilities"],
-  "tipi_version": 15,
+  "tipi_version": 16,
   "version": "0.24.6",
   "description": "The Todo-app to organize your life.",
   "short_desc": "The Todo-app to organize your life.",
@@ -27,5 +28,5 @@
   ],
   "supported_architectures": ["arm64", "amd64"],
   "created_at": 1691943801422,
-  "updated_at": 1734907226000
+  "updated_at": 1734908806202
 }
diff --git a/apps/vikunja/docker-compose.json b/apps/vikunja/docker-compose.json
new file mode 100644
index 0000000000..bb0cff7afe
--- /dev/null
+++ b/apps/vikunja/docker-compose.json
@@ -0,0 +1,51 @@
+{
+  "services": [
+    {
+      "name": "vikunja",
+      "image": "vikunja/vikunja:0.24.6",
+      "isMain": true,
+      "internalPort": 3456,
+      "environment": {
+        "VIKUNJA_DATABASE_HOST": "vikunja-db",
+        "VIKUNJA_DATABASE_PASSWORD": "${VIKUNJA_DB_PASSWORD}",
+        "VIKUNJA_DATABASE_TYPE": "postgres",
+        "VIKUNJA_DATABASE_USER": "tipi",
+        "VIKUNJA_DATABASE_DATABASE": "vikunja",
+        "VIKUNJA_SERVICE_JWTSECRET": "${VIKUNJA_SERVICE_SECRET}",
+        "VIKUNJA_SERVICE_PUBLICURL": "${APP_PROTOCOL:-http}://${APP_DOMAIN}/"
+      },
+      "dependsOn": {
+        "vikunja-db": {
+          "condition": "service_healthy"
+        }
+      },
+      "volumes": [
+        {
+          "hostPath": "${APP_DATA_DIR}/data/files",
+          "containerPath": "/app/vikunja/files"
+        }
+      ]
+    },
+    {
+      "name": "vikunja-db",
+      "image": "postgres:14",
+      "environment": {
+        "POSTGRES_PASSWORD": "${VIKUNJA_DB_PASSWORD}",
+        "POSTGRES_USER": "tipi",
+        "POSTGRES_DB": "vikunja"
+      },
+      "volumes": [
+        {
+          "hostPath": "${APP_DATA_DIR}/data/db",
+          "containerPath": "/var/lib/postgresql/data"
+        }
+      ],
+      "healthCheck": {
+        "interval": "5s",
+        "timeout": "5s",
+        "retries": 5,
+        "test": "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
+      }
+    }
+  ]
+}