diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index bb380b9..89c158e 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -66,6 +66,7 @@ atl_aws_enable_cloudwatch_logs: "{{ lookup('env', 'ATL_AWS_ENABLE_CLOUDWATCH_LOG
 atl_db_engine: "{{ lookup('env', 'ATL_DB_ENGINE') }}"
 atl_db_host: "{{ lookup('env', 'ATL_DB_HOST') }}"
 atl_db_port: "{{ lookup('env', 'ATL_DB_PORT') or '5432' }}"
+atl_db_root_db_name: "{{ lookup('env', 'ATL_DB_ROOT_DB_NAME') or 'postgres' }}"
 atl_db_root_user: "{{ lookup('env', 'ATL_DB_ROOT_USER') or 'postgres' }}"
 atl_db_root_password: "{{ lookup('env', 'ATL_DB_ROOT_PASSWORD') }}"
 atl_db_driver: "{{ lookup('env', 'ATL_DB_DRIVER') or 'org.postgresql.Driver' }}"
diff --git a/roles/database_init/defaults/main.yml b/roles/database_init/defaults/main.yml
index 4620228..8d4d128 100644
--- a/roles/database_init/defaults/main.yml
+++ b/roles/database_init/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 
 atl_db_port: '5432'
+atl_db_root_db_name: 'postgres'
 atl_db_root_user: 'postgres'
 atl_jdbc_encoding: 'UTF-8'
 atl_jdbc_collation: 'C'
diff --git a/roles/database_init/tasks/main.yml b/roles/database_init/tasks/main.yml
index 05a27fa..10b0051 100644
--- a/roles/database_init/tasks/main.yml
+++ b/roles/database_init/tasks/main.yml
@@ -15,7 +15,7 @@
     login_host: "{{ atl_db_host }}"
     login_user: "{{ atl_db_root_user }}"
     login_password: "{{ atl_db_root_password }}"
-    db: "{{ atl_jdbc_db_name }}"
+    db: "{{ atl_db_root_db_name }}"
     query: "ALTER SCHEMA public OWNER to {{ atl_db_root_user }};"
 
 - name: Grant privs to root user on public schema
@@ -23,7 +23,7 @@
     login_host: "{{ atl_db_host }}"
     login_user: "{{ atl_db_root_user }}"
     login_password: "{{ atl_db_root_password }}"
-    db: "{{ atl_jdbc_db_name }}"
+    db: "{{ atl_db_root_db_name }}"
     query: "GRANT ALL ON SCHEMA public TO {{ atl_db_root_user }};"
 
 - name: Grant privs to application user on public schema
@@ -31,7 +31,7 @@
     login_host: "{{ atl_db_host }}"
     login_user: "{{ atl_db_root_user }}"
     login_password: "{{ atl_db_root_password }}"
-    db: "{{ atl_jdbc_db_name }}"
+    db: "{{ atl_db_root_db_name }}"
     query: "GRANT ALL ON SCHEMA public TO {{ atl_jdbc_user }};"
 
 - block: