diff --git a/roles/mailserver_database/defaults/main/plain.yml b/roles/mailserver_database/defaults/main/plain.yml
index 735cf34..6f53108 100644
--- a/roles/mailserver_database/defaults/main/plain.yml
+++ b/roles/mailserver_database/defaults/main/plain.yml
@@ -1,9 +1,9 @@
 ---
 
-mailserver_database: mailserver
-mailserver_user:
+mailserver_database_db: mailserver
+mailserver_database_admin_user:
   name: mailadmin
-  pwd: "{{ vault_mailserver_user_pwd }}"
-mailserver_ro_user:
+  pwd: "{{ vault_mailserver_database_admin_user_pwd }}"
+mailserver_database_ro_user:
   name: mailserver
-  pwd: "{{ vault_mailserver_ro_user_pwd }}"
+  pwd: "{{ vault_mailserver_database_ro_user_pwd }}"
diff --git a/roles/mailserver_database/defaults/main/vault.yml b/roles/mailserver_database/defaults/main/vault.yml
index f4e1c15..2422dcf 100644
--- a/roles/mailserver_database/defaults/main/vault.yml
+++ b/roles/mailserver_database/defaults/main/vault.yml
@@ -1,9 +1,10 @@
 $ANSIBLE_VAULT;1.1;AES256
-34393761613531383133343866383438646331633237353639386539333636613530356636663038
-3934633864373132316331326366303734346234666336380a333862383430393430343762656362
-32613366613965633065316234626238616331323538353132613666323263336638643465393938
-3737616465343664380a306231663432396132346636333433383162383039383763393666393462
-32383632313437353161313636386465313562366336316533303938323364323663616631666538
-65343564326237643461666631323066626563653032333534373764666139306236313731653335
-38613333663436313866623839373036643235656664636265326636303561373362336564636131
-30373737383338656436
+66383530333533353335663463333332376636383837323262346437383639323632353761383139
+3437363665633864303936323834383930613461663561640a363136303637306538306166353133
+31323763646465333466633539363462373366636336323233636334346564303936313565303436
+3432343331356434330a383831363933633830616336653430623636363566363637393365323662
+64616633656163333136633464386237633232316561396161306134333832643665393438646536
+31336138353635313333623861313537613635383639356462623639393061323734623936373337
+66646534653463626330623734313630313033633161336238396533313430326132333537326462
+32353736343838323837336661623564336432383834383230366666353238633439633037333339
+6339
diff --git a/roles/mailserver_database/tasks/main.yml b/roles/mailserver_database/tasks/main.yml
index 373e19e..50ea3eb 100644
--- a/roles/mailserver_database/tasks/main.yml
+++ b/roles/mailserver_database/tasks/main.yml
@@ -13,8 +13,8 @@
   become: true
   become_user: postgres
   loop:
-    - "{{ mailserver_user }}"
-    - "{{ mailserver_ro_user }}"
+    - "{{ mailserver_database_admin_user }}"
+    - "{{ mailserver_database_ro_user }}"
   community.postgresql.postgresql_user:
     name: "{{ item.name }}"
     state: present
@@ -24,8 +24,8 @@
   become: true
   become_user: postgres
   community.postgresql.postgresql_db:
-    name: "{{ mailserver_database }}"
-    owner: "{{ mailserver_user.name }}"
+    name: "{{ mailserver_database_db }}"
+    owner: "{{ mailserver_database_admin_user.name }}"
     state: present
 
 - name: Upload postgresql tables script
@@ -40,18 +40,18 @@
   become: true
   become_user: postgres
   community.postgresql.postgresql_script:
-    db: "{{ mailserver_database }}"
+    db: "{{ mailserver_database_db }}"
     path: ~/mailserver_tables.sql
-    login_user: "{{ mailserver_user.name }}"
-    login_password: "{{ mailserver_user.pwd }}"
+    login_user: "{{ mailserver_database_admin_user.name }}"
+    login_password: "{{ mailserver_database_admin_user.pwd }}"
     login_host: 127.0.0.1
 
 - name: Set privileges for postgresql RO user
   become: true
   become_user: postgres
   community.postgresql.postgresql_privs:
-    database: "{{ mailserver_database }}"
-    roles: "{{ mailserver_ro_user.name }}"
+    database: "{{ mailserver_database_db }}"
+    roles: "{{ mailserver_database_ro_user.name }}"
     privs: select
     objs: ALL_IN_SCHEMA
     state: present