diff --git a/roles/user/secrets/bw/tasks/main.yml b/roles/user/secrets/bw/tasks/main.yml
index 72dcf2b..3db6f6e 100644
--- a/roles/user/secrets/bw/tasks/main.yml
+++ b/roles/user/secrets/bw/tasks/main.yml
@@ -17,15 +17,21 @@
     state: directory
     mode: 0700
     owner: "{{ target_user }}"
-    group: "{{ target_user }}"
+    group: "{{ target_group }}"
 
-- name: Create directories for different Bitwarden accounts
+- name: Create directories for public Bitwarden instance
   ansible.builtin.file:
-    path: "~/.config/Bitwarden CLI/{{ item }}"
+    path: "~/.config/Bitwarden CLI/vault.bitwarden.com"
     state: directory
     mode: 0700
     owner: "{{ target_user }}"
-    group: "{{ target_user }}"
-  loop:
-    - vault.bitwarden.com
-    - vault.mfocko.xyz
+    group: "{{ target_group }}"
+
+- name: Create directory for the self-hosted Vaultwarden instance
+  ansible.builtin.file:
+    path: "~/.config/Bitwarden CLI/{{ vaultwarden_address }}"
+    state: directory
+    mode: 0700
+    owner: "{{ target_user }}"
+    group: "{{ target_group }}"
+  when: vaultwarden_address