diff --git a/roles/database_init/tasks/main.yml b/roles/database_init/tasks/main.yml
index 1b238cb..05a27fa 100644
--- a/roles/database_init/tasks/main.yml
+++ b/roles/database_init/tasks/main.yml
@@ -16,7 +16,7 @@
     login_user: "{{ atl_db_root_user }}"
     login_password: "{{ atl_db_root_password }}"
     db: "{{ atl_jdbc_db_name }}"
-    query: "ALTER SCHEMA public OWNER to {{ atl_db_root_password }};"
+    query: "ALTER SCHEMA public OWNER to {{ atl_db_root_user }};"
 
 - name: Grant privs to root user on public schema
   postgresql_query:
@@ -24,7 +24,7 @@
     login_user: "{{ atl_db_root_user }}"
     login_password: "{{ atl_db_root_password }}"
     db: "{{ atl_jdbc_db_name }}"
-    query: "GRANT ALL ON SCHEMA public TO {{ atl_db_root_password }};"
+    query: "GRANT ALL ON SCHEMA public TO {{ atl_db_root_user }};"
 
 - name: Grant privs to application user on public schema
   postgresql_query:
@@ -32,7 +32,7 @@
     login_user: "{{ atl_db_root_user }}"
     login_password: "{{ atl_db_root_password }}"
     db: "{{ atl_jdbc_db_name }}"
-    query: "GRANT ALL ON SCHEMA public TO {{ atl_jdbc_password }};"
+    query: "GRANT ALL ON SCHEMA public TO {{ atl_jdbc_user }};"
 
 - block: