diff --git a/compose.yml b/compose.yml
index 3ed5be8..c1df91e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -45,10 +45,28 @@ services:
     command: "--config-path /etc/gotosocial/config.yaml"
     networks:
       - fogtype
+  vikunja-api:
+    image: vikunja/api:0.20.4
+    restart: unless-stopped
+    environment:
+      VIKUNJA_SERVICE_FRONTENDURL: https://task.fogtype.com/
+      VIKUNJA_SERVICE_ENABLEREGISTRATION: "false"
+      VIKUNJA_DATABASE_TYPE: sqlite
+      VIKUNJA_DATABASE_PATH: files/vikunja.db
+    volumes:
+      - "vikunja_data:/app/vikunja/files"
+    networks:
+      - fogtype
+  vikunja-frontend:
+    image: vikunja/frontend:0.20.5
+    restart: unless-stopped
+    networks:
+      - fogtype
 volumes:
   caddy_data:
   caddy_config:
   gotosocial_data:
+  vikunja_data:
 networks:
   fogtype:
     ipam:
diff --git a/etc/caddy/Caddyfile b/etc/caddy/Caddyfile
index 1c0de2a..5aa121d 100644
--- a/etc/caddy/Caddyfile
+++ b/etc/caddy/Caddyfile
@@ -21,3 +21,9 @@ dns.fogtype.com {
 		}
 	}
 }
+task.fogtype.com {
+	reverse_proxy /.well-known/* vikunja-api:3456
+	reverse_proxy /api/* vikunja-api:3456
+	reverse_proxy /dav/* vikunja-api:3456
+	reverse_proxy vikunja-frontend:80
+}