diff --git a/_docs/smtp-servers.md b/_docs/smtp-servers.md
new file mode 100644
index 0000000..dd813db
--- /dev/null
+++ b/_docs/smtp-servers.md
@@ -0,0 +1,11 @@
+# SMTP servers
+
+List of SMTP servers that have a free tier.
+
+## SendGrid (100 emails per day)
+
+## MailJet (200 emails per day)
+
+## SendinBlue (300 emails per day)
+
+## SMTP2GO (1000 emails per month)
diff --git a/bitwarden/bitwarden.env b/bitwarden/bitwarden.env
deleted file mode 100644
index e69de29..0000000
diff --git a/bitwarden/docker-compose.yml b/bitwarden/docker-compose.yml
deleted file mode 100644
index fe0e109..0000000
--- a/bitwarden/docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-# bitwarden
-#
-# Version 1
-################################################################################
-
-version: "3"
-
-volumes:
-  bitwarden:
-
-networks:
-  admin_web:
-    external:
-      name: admin_web
-
-services:
-  bitwarden:
-    # https://hub.docker.com/r/bitwardenrs/server
-    image: bitwardenrs/server:${BITWARDEN_V}
-    env_file: ./bitwarden.env
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - bitwarden:/data/:rw
-    networks:
-        - admin_web
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${PREFIX}_bitwarden.rule=Host(`${BITWARDEN_DOMAIN_NAME}`)"
-      - "traefik.http.routers.${PREFIX}_bitwarden.entrypoints=websecure"
-      - "traefik.http.routers.${PREFIX}_bitwarden.tls.certresolver=letsencrypt"
-      - "traefik.http.services.${PREFIX}_bitwarden.loadbalancer.server.port=80"
diff --git a/bitwarden/env-sample b/bitwarden/env-sample
deleted file mode 100644
index a85710c..0000000
--- a/bitwarden/env-sample
+++ /dev/null
@@ -1,6 +0,0 @@
-# Domains & Project
-PREFIX=p1
-BITWARDEN_DOMAIN_NAME=passtool.nickyeoman.com
-
-# Software versions
-BITWARDEN_V=1.14.2
diff --git a/vaultwarden/README.md b/vaultwarden/README.md
new file mode 100644
index 0000000..8458cd1
--- /dev/null
+++ b/vaultwarden/README.md
@@ -0,0 +1,15 @@
+# Vaultwarden
+
+Dockerhub: https://hub.docker.com/r/vaultwarden/server
+Github: https://github.com/dani-garcia/vaultwarden
+Wiki: https://github.com/dani-garcia/vaultwarden/wiki
+
+Reverse Proxy Port: 80
+
+## Usage
+
+[Disable new users](https://github.com/dani-garcia/bitwarden_rs/wiki/Disable-registration-of-new-users).
+
+[SMTP](https://github.com/dani-garcia/bitwarden_rs/wiki/SMTP-configuration)
+
+To enable the admin page, you need to set an authentication token. This token can be anything, but it's recommended to use a long, randomly generated string of characters, for example running openssl rand -base64 48.
\ No newline at end of file
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
new file mode 100644
index 0000000..01ace63
--- /dev/null
+++ b/vaultwarden/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  vaultwarden:
+    image: ${VAULT_IMAGE:-vaultwarden/server:latest}
+    restart: unless-stopped
+    environment:
+      WEBSOCKET_ENABLED: "${VAULT_WEBSOCKET_ENABLED:-true}" # Enable WebSocket notifications
+      SIGNUPS_ALLOWED: "${VAULT_SIGNUPS_ALLOWED:-false}" # Disable new user signups
+      DOMAIN: ${VAULT_DOMAIN}
+      ADMIN_TOKEN: "${VAULT_ADMIN_TOKEN}"
+      SMTP_HOST: ${SMTP_HOST}
+      SMTP_FROM: ${SMTP_FROM}
+      SMTP_PORT: ${SMTP_PORT}
+      SMTP_SECURITY: ${SMTP_SECURITY}
+      SMTP_USERNAME: ${SMTP_USERNAME}
+      SMTP_PASSWORD: ${SMTP_PASSWORD}
+    volumes:
+      - "${VOL_PATH:-./data}/vault-data:/data"
+
+
diff --git a/vaultwarden/sample-extends.yml b/vaultwarden/sample-extends.yml
new file mode 100644
index 0000000..c399490
--- /dev/null
+++ b/vaultwarden/sample-extends.yml
@@ -0,0 +1,7 @@
+version: '3.4'
+
+services:
+	vaultwarden:
+		extends:
+			file: ${COOKBOOK}/vaultwarden/docker-compose.yml
+			service: vaultwarden
\ No newline at end of file
diff --git a/vaultwarden/sample.env b/vaultwarden/sample.env
new file mode 100644
index 0000000..86d7e56
--- /dev/null
+++ b/vaultwarden/sample.env
@@ -0,0 +1,17 @@
+# VaultWarden
+PRODDIR=/var/www/stashdomain-com/ #HELP: project_path
+COOKBOOK=/home/user/git/docker-compose-cookbooks #HELP: cookbooks
+VOL_PATH=/project-dir/project-name/data #HELP: volpath
+# VaultWarden Container
+VAULT_DOMAIN_NAME=www.YourDomain.com
+VAULT_IMAGE=vaultwarden/server:1.31.0
+WEBSOCKET_ENABLED=true # Enable WebSocket notifications
+SIGNUPS_ALLOWED=false # Disable new user signups
+VAULT_ADMIN_TOKEN=01234567890123456790123456790123456789012345678 #HELP: gen32
+# SMTP
+SMTP_HOST=smtp.domain.tld
+SMTP_FROM=vaultwarden@domain.tld
+SMTP_PORT=587
+SMTP_SECURITY=starttls
+SMTP_USERNAME=username
+SMTP_PASSWORD=password
\ No newline at end of file