diff --git a/docker-compose.yml b/docker-compose.yml
index 526362e..1e0a3d7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,13 +2,13 @@ version: '3'
 
 services:
   db:
-    image: postgres:17.0@sha256:8d3be35b184e70d81e54cbcbd3df3c0b47f37d06482c0dd1c140db5dbcc6a808
+    image: postgres:17.0@sha256:4ec37d2a07a0067f176fdcc9d4bb633a5724d2cc4f892c7a2046d054bb6939e5
     restart: unless-stopped
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWORD=${DC_VIKUNJA_POSTGRES_PASSWORD:?}
-      - POSTGRES_DB=${DC_VIKUNJA_POSTGRES_DB:-db}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?}
+      - POSTGRES_DB=${POSTGRES_DB:-db}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 5s
@@ -18,43 +18,43 @@ services:
       - vikunja
 
   vikunja:
-    image: vikunja/vikunja:0.24.4@sha256:c93c58841215592c51a40fa978da25efadd1fff2460b42443c344132f322eef1
+    image: vikunja/vikunja:0.24.3@sha256:c400bdcb2ae4a78fccb9b463d01f96d1b2cfaef3484a4dd5c2a26e55eadc2d7a
     environment:
       VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: ${DC_VIKUNJA_POSTGRES_PASSWORD:?}
+      VIKUNJA_DATABASE_PASSWORD: ${POSTGRES_PASSWORD:?}
       VIKUNJA_DATABASE_TYPE: postgres
       VIKUNJA_DATABASE_USER: postgres
-      VIKUNJA_DATABASE_DATABASE: ${DC_VIKUNJA_POSTGRES_DB:-db}
-      VIKUNJA_SERVICE_PUBLICURL: https://${DC_VIKUNJA_HOSTNAME:?}
-      VIKUNJA_SERVICE_JWTSECRET: ${DC_VIKUNJA_JWTSECRET:?}
+      VIKUNJA_DATABASE_DATABASE: ${POSTGRES_DB:-db}
+      VIKUNJA_SERVICE_PUBLICURL: https://${VIKUNJA_VHOST:-tasks.martin.md}
+      VIKUNJA_SERVICE_JWTSECRET: ${VIKUNJA_JWTSECRET:?}
       VIKUNJA_SERVICE_ENABLETASKATTACHMENTS: 1
       VIKUNJA_SERVICE_ENABLEREGISTRATION: 1
       VIKUNJA_SERVICE_ENABLEEMAILREMINDERS: 1
       VIKUNJA_MAILER_ENABLED: 1
       VIKUNJA_MAILER_FORCESSL: 1
-      VIKUNJA_MAILER_HOST: ${DC_VIKUNJA_SMTP_HOST:-mail.martin.md}
-      VIKUNJA_MAILER_PORT: ${DC_VIKUNJA_SMTP_PORT:-587}
-      VIKUNJA_MAILER_USERNAME: ${DC_VIKUNJA_SMTP_USER:-noreply@martin.md}
-      VIKUNJA_MAILER_PASSWORD: ${DC_VIKUNJA_SMTP_PWD:?}
+      VIKUNJA_MAILER_HOST: ${SMTP_HOST:-mail.martin.md}
+      VIKUNJA_MAILER_PORT: ${SMTP_PORT:-587}
+      VIKUNJA_MAILER_USERNAME: ${SMTP_USER:-noreply@martin.md}
+      VIKUNJA_MAILER_PASSWORD: ${SMTP_PWD:?}
+
+      VIRTUAL_HOST: ${VIKUNJA_VHOST:-tasks.martin.md}
+      VIRTUAL_PORT: ${VIKUNJA_VPORT:-3456}
+      LETSENCRYPT_HOST: ${VIKUNJA_VHOST:-tasks.martin.md}
     volumes: 
       - files:/app/vikunja/files
       - /srv/docker/vikunja-config.yml:/app/vikunja/config.yml
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.vikunja.rule=Host(`${DC_VIKUNJA_HOSTNAME:?}`)"
-      - "traefik.http.routers.vikunja.entrypoints=websecure"
     depends_on:
       db:
         condition: service_healthy
     restart: unless-stopped
     networks:
       - vikunja
-      - traefik
+      - net
 
 networks:
   vikunja:
     external: false
-  traefik:
+  net:
     external: true
 
 volumes: