diff --git a/.env.example b/.env.example
index 84fea4e..e62b760 100644
--- a/.env.example
+++ b/.env.example
@@ -13,4 +13,5 @@ HOSTNAME_PHOTOS=photos.example.com
 HOSTNAME_GITEA=git.example.com
 HOSTNAME_HOMEPAGE=ui.example.com
 HOSTNAME_SAGE=sage.example.com
-HOSTNAME_AQS=example.com
\ No newline at end of file
+HOSTNAME_AQS=example.com
+HOSTNAME_PASSWORDS=passwords.example.com
diff --git a/README.md b/README.md
index 23b4e82..fff7f60 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,9 @@ Gitea is a lightweight self-hosted Git service, similar to GitHub.
 ### [Immich](https://immich.app/)
 Google Photos self-hosted alternative.
 
+### [Vaultwarden](https://github.com/dani-garcia/vaultwarden)
+Password Manager, Bitwarden-compatible server written in Rust.
+
 ### [Homepage](./homepage/src/index.html)
 A simple homepage with links to all the services.
 
diff --git a/compose.yml b/compose.yml
index a10f681..e90b022 100644
--- a/compose.yml
+++ b/compose.yml
@@ -172,4 +172,27 @@ services:
         - "traefik.http.routers.homepage.entrypoints=websecure"
         - "traefik.http.routers.homepage.tls=true"
         - "traefik.http.routers.homepage.tls.certresolver=myresolver"
-        - "traefik.http.services.homepage.loadbalancer.server.port=80"
\ No newline at end of file
+        - "traefik.http.services.homepage.loadbalancer.server.port=80"
+
+  vaultwarden:
+    container_name: vaultwarden
+    image: vaultwarden/server:latest
+    environment:
+      - DOMAIN=https://${HOSTNAME_PASSWORDS}
+    volumes:
+      - ./.volumes/vaultwarden:/data
+    restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+          cpus: '0.5'
+    security_opt:
+      - no-new-privileges:true
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.vaultwarden.rule=Host(`${HOSTNAME_PASSWORDS}`)"
+      - "traefik.http.routers.vaultwarden.entrypoints=websecure"
+      - "traefik.http.routers.vaultwarden.tls=true"
+      - "traefik.http.routers.vaultwarden.tls.certresolver=myresolver"
+      - "traefik.http.services.vaultwarden.loadbalancer.server.port=80"
diff --git a/homepage/src/index.html b/homepage/src/index.html
index 1e1ec6d..9bafda3 100644
--- a/homepage/src/index.html
+++ b/homepage/src/index.html
@@ -85,10 +85,16 @@
                 ⬇️ Torrents
             </a>
         </li>
+        <li>
+            <a href="https://$HOSTNAME_PASSWORDS"
+               target="_blank">
+                🔑 Passwords
+            </a>
+        </li>
         <li>
             <a href="https://$HOSTNAME_GITEA"
                target="_blank">
-                📦 Gitea
+                📦 Git
             </a>
         </li>
         <li>