diff --git a/README.rst b/README.rst
index d3deff18..41dcafa8 100644
--- a/README.rst
+++ b/README.rst
@@ -19,4 +19,4 @@ This role will install the following:
       vars:
         external_lb_vip_address: 172.16.24.1
         internal_lb_vip_address: 192.168.0.1
-        galera_address: "{{ internal_lb_vip_address }}"
+        keystone_galera_address: "{{ internal_lb_vip_address }}"
diff --git a/tasks/keystone_db_setup.yml b/tasks/keystone_db_setup.yml
index 8b1c92e9..9bdf171a 100644
--- a/tasks/keystone_db_setup.yml
+++ b/tasks/keystone_db_setup.yml
@@ -17,7 +17,7 @@
   mysql_db:
     login_user: "{{ galera_root_user }}"
     login_password: "{{ galera_root_password }}"
-    login_host: "{{ galera_address }}"
+    login_host: "{{ keystone_galera_address }}"
     name: "{{ keystone_galera_database }}"
     state: "present"
   tags:
@@ -27,7 +27,7 @@
   mysql_user:
     login_user: "{{ galera_root_user }}"
     login_password: "{{ galera_root_password }}"
-    login_host: "{{ galera_address }}"
+    login_host: "{{ keystone_galera_address }}"
     name: "{{ keystone_galera_user }}"
     password: "{{ keystone_container_mysql_password }}"
     host: "{{ item }}"
diff --git a/templates/keystone.conf.j2 b/templates/keystone.conf.j2
index 520e8909..90f00ca4 100644
--- a/templates/keystone.conf.j2
+++ b/templates/keystone.conf.j2
@@ -47,7 +47,7 @@ methods = {{ keystone_auth_methods }}
 
 
 [database]
-connection = mysql://{{ keystone_galera_user }}:{{ keystone_container_mysql_password }}@{{ galera_address }}/{{ keystone_galera_database }}?charset=utf8
+connection = mysql://{{ keystone_galera_user }}:{{ keystone_container_mysql_password }}@{{ keystone_galera_address }}/{{ keystone_galera_database }}?charset=utf8
 idle_timeout = {{ keystone_database_idle_timeout }}
 min_pool_size = {{ keystone_database_min_pool_size }}
 max_pool_size = {{ keystone_database_max_pool_size }}