diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4e680dc..8810e4d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,30 +1,36 @@
 services:
-  linkwarden:
-    image: ghcr.io/linkwarden/linkwarden:latest
-    container_name: linkwarden
+  vaultwarden:
+    image: vaultwarden/server:latest
+    container_name: vaultwarden
     restart: unless-stopped
 
-    env_file:
-      - .env
-
     volumes:
-      - /mnt/docker/linkwarden:/data/data
-
-    environment:
-      BASE_URL: https://linkwarden.ljh31.de
-      AUTH_OAUTH_KEYCLOAK_NAME: Keycloak
-
-    networks:
-      - infra-traefik_traefik-net
-
+      - /mnt/docker/vaultwarden:/data
+    ports:
+      - "6000:80"
+      - "6001:3012"
     labels:
+      # --- Traefik ---
       - "traefik.enable=true"
-      - "traefik.http.routers.linkwarden.rule=Host(`linkwarden.ljh31.de`)"
-      - "traefik.http.routers.linkwarden.entrypoints=websecure"
-      - "traefik.http.routers.linkwarden.tls=true"
-      - "traefik.http.routers.linkwarden.tls.certresolver=letsencrypt"
-      - "traefik.http.services.linkwarden.loadbalancer.server.port=3000"
+      - "traefik.http.routers.vaultwarden.rule=Host(`${HOST}`)"
+      - "traefik.http.routers.vaultwarden.entrypoints=websecure"
+      - "traefik.http.routers.vaultwarden.tls=true"
+      - "traefik.http.routers.vaultwarden.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.vaultwarden.service=vaultwarden-svc"
+      - "traefik.http.services.vaultwarden-svc.loadbalancer.server.url=http://10.0.0.3:6000"
+      - "traefik.http.routers.vaultwarden-ws.rule=Host(`${HOST}`) && Path(`/notifications/hub`)"
+      - "traefik.http.routers.vaultwarden-ws.entrypoints=websecure"
+      - "traefik.http.routers.vaultwarden-ws.tls=true"
+      - "traefik.http.routers.vaultwarden-ws.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.vaultwarden-ws.service=vaultwarden-ws-svc"
+      - "traefik.http.services.vaultwarden-ws-svc.loadbalancer.server.url=http://10.0.0.3:6001"
+      # --- Homepage ---
+      - "homepage.group=Security"
+      - "homepage.name=Vaultwarden"
+      - "homepage.icon=vaultwarden.png"
+      - "homepage.href=${DOMAIN}"
+      - "homepage.description=Passwort-Manager"
 
-networks:
-  infra-traefik_traefik-net:
-    external: true
+volumes:
+  vaultwarden_data:
+    driver: local