diff --git a/defaults/main.yml b/defaults/main.yml
index e6cab99..409379a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
 bitwarden_domain: vault.example.com
 bitwarden_project: example
 bitwarden_image: vaultwarden/server
-bitwarden_version: 1.24.0-alpine
+bitwarden_version: 1.30.3-alpine
 bitwarden_port_web: 80
 bitwarden_port_ws: 3021
 bitwarden_service_name: bitwarden-{{ bitwarden_project }}
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 496d508..acd7332 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -13,8 +13,9 @@ services:
       - "127.0.0.1:{{ bitwarden_port_web }}:80"
       - "127.0.0.1:{{ bitwarden_port_ws }}:3021"
     volumes:
-      - "data-{{ bitwarden_project }}":/data
+      - data:/data
     env_file:
       - ./.env
 volumes:
-   "data-{{ bitwarden_project }}":
+   data:
+    name: "{{ bitwarden_service_name }}-data"