diff --git a/ansible/roles/vaultwarden/files/docker-compose.yml b/ansible/roles/vaultwarden/files/docker-compose.yml
index ecece52..465cb07 100644
--- a/ansible/roles/vaultwarden/files/docker-compose.yml
+++ b/ansible/roles/vaultwarden/files/docker-compose.yml
@@ -13,12 +13,12 @@ services:
     labels:
       - traefik.enable=true
 
-      - traefik.http.routers.vaultwarden-ui.rule=Host(`bw.jakehoward.tech`)
+      - traefik.http.routers.vaultwarden-ui.rule=Host(`bw.jakehoward.tech`) || Host(`vaultwarden.jakehoward.tech`)
       - traefik.http.routers.vaultwarden-ui.service=vaultwarden-ui
       - traefik.http.services.vaultwarden-ui.loadbalancer.server.port=80
       - traefik.http.routers.vaultwarden-ui.tls.certresolver=le
 
-      - traefik.http.routers.vaultwarden-websocket.rule=Host(`bw.jakehoward.tech`) && Path(`/notifications/hub`)
+      - traefik.http.routers.vaultwarden-websocket.rule=(Host(`bw.jakehoward.tech`) || Host(`vaultwarden.jakehoward.tech`) )&& Path(`/notifications/hub`)
       - traefik.http.routers.vaultwarden-websocket.service=vaultwarden-websocket
       - traefik.http.services.vaultwarden-websocket.loadbalancer.server.port=3012
       - traefik.http.routers.vaultwarden-websocket.tls.certresolver=le
@@ -31,11 +31,11 @@ services:
       - traefik.http.routers.vaultwarden-websocket.middlewares=vaultwarden-ratelimit,vaultwarden-compress
     environment:
       - SIGNUPS_ALLOWED=false
-      - DOMAIN=https://bw.jakehoward.tech
+      - DOMAIN=https://vaultwarden.jakehoward.tech
       - SHOW_PASSWORD_HINT=false
-      - DATABASE_URL=postgres://bitwarden:{{ bitwarden_database_password }}@db/bitwarden
+      - DATABASE_URL=postgres://vaultwarden:{{ vaultwarden_database_password }}@db/vaultwarden
       - INVITATIONS_ALLOWED=false
-      - ROCKET_WORKERS={{ ansible_processor_nproc }}
+      - ROCKET_WORKERS={{ ansible_processor_nproc // 2 }}
       - WEBSOCKET_ENABLED=true
 
   db:
@@ -44,5 +44,5 @@ services:
     volumes:
       - /mnt/tank/dbs/postgres/vaultwarden/:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWORD={{ bitwarden_database_password }}
-      - POSTGRES_USER=bitwarden
+      - POSTGRES_PASSWORD={{ vaultwarden_database_password }}
+      - POSTGRES_USER=vaultwarden
diff --git a/ansible/roles/vaultwarden/vars/main.yml b/ansible/roles/vaultwarden/vars/main.yml
index ae83496..7882d3c 100644
--- a/ansible/roles/vaultwarden/vars/main.yml
+++ b/ansible/roles/vaultwarden/vars/main.yml
@@ -1,4 +1,4 @@
-bitwarden_database_password: !vault |
+vaultwarden_database_password: !vault |
   $ANSIBLE_VAULT;1.1;AES256
   37666163343038663763633038323938383665386463666239313431626334613432346462656366
   3937363766396236326333353332393564623736336535630a333930613864396536366330633438
diff --git a/terraform/jakehoward.tech.tf b/terraform/jakehoward.tech.tf
index 3b87359..1361c68 100644
--- a/terraform/jakehoward.tech.tf
+++ b/terraform/jakehoward.tech.tf
@@ -147,3 +147,11 @@ resource "cloudflare_record" "jakehowardtech_bw" {
   type    = "A"
   ttl     = 1
 }
+
+resource "cloudflare_record" "jakehowardtech_vaultwarden" {
+  zone_id = cloudflare_zone.jakehowardtech.id
+  name    = "vaultwarden"
+  value   = vultr_instance.casey.main_ip
+  type    = "A"
+  ttl     = 1
+}