diff --git a/roles/mastodon/tasks/system_setup/prepare_database.yml b/roles/mastodon/tasks/system_setup/prepare_database.yml
index c4c15ae..84b0901 100644
--- a/roles/mastodon/tasks/system_setup/prepare_database.yml
+++ b/roles/mastodon/tasks/system_setup/prepare_database.yml
@@ -1,6 +1,6 @@
 - name: mastodon | postgres | Create database {{ mastodon_db }}
   postgresql_db:
-    name: mastodon | postgres | "{{ mastodon_db }}"
+    name: "{{ mastodon_db }}"
     login_host: "{{ mastodon_db_login_host }}"
     login_password: "{{ mastodon_db_login_password }}"
     login_user: "{{ mastodon_db_login_user }}"
@@ -15,7 +15,7 @@
 - name: mastodon | postgres | Create database user {{ mastodon_db_user }}
   postgresql_user:
     db: "{{ mastodon_db }}"
-    name: mastodon | postgres | "{{ mastodon_db_user }}"
+    name: "{{ mastodon_db_user }}"
     password: "{{ mastodon_db_password }}"
     login_host: "{{ mastodon_db_login_host }}"
     login_password: "{{ mastodon_db_login_password }}"
@@ -31,7 +31,7 @@
 
 - name: mastodon | postgres | Create database {{ mastodon_db }}
   postgresql_db:
-    name: mastodon | postgres | "{{ mastodon_db }}"
+    name: "{{ mastodon_db }}"
     login_unix_socket: "{{ mastodon_db_login_unix_socket }}"
   register: create_local_db
   when: create_remote_db is skipped
@@ -39,7 +39,7 @@
 - name: mastodon | postgres | Create database user {{ mastodon_db_user }}
   postgresql_user:
     db: "{{ mastodon_db }}"
-    name: mastodon | postgres | "{{ mastodon_db_user }}"
+    name: "{{ mastodon_db_user }}"
     password: "{{ mastodon_db_password }}"
     encrypted: yes
     login_unix_socket: "{{ mastodon_db_login_unix_socket }}"