diff --git a/apps/vaultwarden/config.json b/apps/vaultwarden/config.json
new file mode 100644
index 00000000..029be6e0
--- /dev/null
+++ b/apps/vaultwarden/config.json
@@ -0,0 +1,21 @@
+{
+    "name": "VaultWarden",
+    "available": true,
+    "port": 8107,
+    "id": "Vaultwarden",
+    "description": "Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.",
+    "short_desc": "All your passwords in your control!",
+    "author": "Stetsed",
+    "source": "https://github.com/dani-garcia/vaultwarden",
+    "image": "https://raw.githubusercontent.com/dani-garcia/vaultwarden/b636d20c6475bfb1b36561cb95812faee26ea7db/resources/vaultwarden-icon.svg",
+    "form_fields": {
+        "admin_password": {
+            "type": "password",
+            "label": "Admin Panel Password",
+            "max": 50,
+            "min": 10,
+            "required": true,
+            "env_variable": "VAULTWARDEN_ADMIN_PASSWORD"
+          }
+    }
+  }
\ No newline at end of file
diff --git a/apps/vaultwarden/docker-compose.yml b/apps/vaultwarden/docker-compose.yml
new file mode 100644
index 00000000..0d9d8b03
--- /dev/null
+++ b/apps/vaultwarden/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3'
+
+services:
+  vaultwarden:
+    image: vaultwarden/server
+    container_name: vaultwarden
+    restart: unless-stopped
+    ports:
+      - ${APP_PORT}:80
+    networks:
+      - tipi_main_network
+    environment:
+      - WEBSOCKET_ENABLED=true
+      - ADMIN_TOKEN=${VAULTWARDEN_ADMIN_PASSWORD}
+    volumes:
+      - ${APP_DATA_DIR}/data:/data