diff --git a/examples/openstack/group_vars/all b/examples/openstack/group_vars/all
index 2c6a2a8..78cd251 100644
--- a/examples/openstack/group_vars/all
+++ b/examples/openstack/group_vars/all
@@ -5,7 +5,6 @@ database_root_password: secret
 
 rabbitmq_password: secret
 
-keystone_ssl: True
 keystone_fqdn: host.example.com
 keystone_root_domain: example.com
 keystone_p12password: secret
diff --git a/roles/os-common/defaults/main.yml b/roles/os-common/defaults/main.yml
index 6306393..80ba3dd 100644
--- a/roles/os-common/defaults/main.yml
+++ b/roles/os-common/defaults/main.yml
@@ -35,7 +35,9 @@ keystone_admin_port: 35357
 keystone_public_port: 5000
 
 # Setup keystone with SSL
-keystone_ssl: false
+keystone_ssl: True
+keystone_fqdn: "{{ ansible_fqdn }}"
+keystone_root_domain: "example.com"
 
 # Password for 'nova' user
 # nova_user_password: <password>
diff --git a/roles/os-glance/tasks/glance_project_access.yml b/roles/os-glance/tasks/glance_project_access.yml
index a58b5e9..1cec84d 100644
--- a/roles/os-glance/tasks/glance_project_access.yml
+++ b/roles/os-glance/tasks/glance_project_access.yml
@@ -25,7 +25,7 @@
       password: "{{ glance_user_password  }}"
       domain_name: "Default"
       email: "{{item.name}}@example.com"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { name: "glance", project: "admin" }
@@ -40,7 +40,7 @@
       user_name: "{{item.user}}"
       project_name: "{{item.project}}"
       role_name: "{{item.role}}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { user: "glance", project: "service", role: "admin"}
diff --git a/roles/os-glance/tasks/glance_service_entities.yml b/roles/os-glance/tasks/glance_service_entities.yml
index 58f2fb7..7594dff 100644
--- a/roles/os-glance/tasks/glance_service_entities.yml
+++ b/roles/os-glance/tasks/glance_service_entities.yml
@@ -23,7 +23,7 @@
       service_name: "glance"
       service_type: "image"
       description: "Glance Image Service"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
 
   - name: Create glance endpoints
@@ -43,5 +43,5 @@
           interface: "internal"
         - url: "http://{{ groups['openstack_image'][0] }}:9292"
           interface: "admin"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
diff --git a/roles/os-glance/templates/glance-api.conf.j2 b/roles/os-glance/templates/glance-api.conf.j2
index cd55801..f95f92b 100644
--- a/roles/os-glance/templates/glance-api.conf.j2
+++ b/roles/os-glance/templates/glance-api.conf.j2
@@ -8,8 +8,8 @@ debug = True
 connection = mysql+pymysql://glance:{{ glance_database_password }}@{{ groups['dbservers'][0] }}/glance
 
 [keystone_authtoken]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
diff --git a/roles/os-glance/templates/glance-registry.conf.j2 b/roles/os-glance/templates/glance-registry.conf.j2
index 801351e..99a9aff 100644
--- a/roles/os-glance/templates/glance-registry.conf.j2
+++ b/roles/os-glance/templates/glance-registry.conf.j2
@@ -7,8 +7,8 @@ debug = True
 connection = mysql+pymysql://glance:{{ glance_database_password }}@{{ groups['dbservers'][0] }}/glance
 
 [keystone_authtoken]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
diff --git a/roles/os-heat/tasks/heat_project_access.yml b/roles/os-heat/tasks/heat_project_access.yml
index 1f236e5..ee5588f 100644
--- a/roles/os-heat/tasks/heat_project_access.yml
+++ b/roles/os-heat/tasks/heat_project_access.yml
@@ -19,7 +19,7 @@
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       command: "ensure_domain"
       domain_name: "{{ heat_domain }}"
       insecure: yes
@@ -36,7 +36,7 @@
       password: "{{ item.password }}"
       domain_name: "{{ item.domain }}"
       email: "{{item.name}}@example.com"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - name: "heat"
@@ -54,7 +54,7 @@
     keystone:
       command: "ensure_role"
       role_name: "{{item}}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -73,7 +73,7 @@
       user_name: "{{ item.user }}"
       project_name: "{{ item.project }}"
       role_name: "{{ item.role }}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { user: "heat", project: "service", role: "admin"}
diff --git a/roles/os-heat/tasks/heat_service_entities.yml b/roles/os-heat/tasks/heat_service_entities.yml
index 9518c63..97a9339 100644
--- a/roles/os-heat/tasks/heat_service_entities.yml
+++ b/roles/os-heat/tasks/heat_service_entities.yml
@@ -23,7 +23,7 @@
       service_name: "{{ item.name }}"
       service_type: "{{ item.type }}"
       description: "{{ item.description }}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { name: "heat", type: "orchestration", description: "OpenStack Orchestration" }
@@ -46,7 +46,7 @@
           interface: "internal"
         - url: "{{ item.admin_url }}"
           interface: "admin"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - name: heat
diff --git a/roles/os-heat/templates/heat.conf.j2 b/roles/os-heat/templates/heat.conf.j2
index 0175fe1..dfa71fb 100644
--- a/roles/os-heat/templates/heat.conf.j2
+++ b/roles/os-heat/templates/heat.conf.j2
@@ -18,8 +18,8 @@ rabbit_userid = {{ rabbitmq_username }}
 rabbit_password = {{ rabbitmq_password }}
 
 [keystone_authtoken]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
@@ -31,8 +31,8 @@ insecure = True
 {% endif %}
 
 [trustee]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
@@ -45,13 +45,13 @@ insecure = True
 {% endif %}
 
 [clients_keystone]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
 {% if keystone_ssl %}
 insecure = True
 {% endif %}
 
 [ec2authtoken]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
 {% if keystone_ssl %}
 insecure = True
 {% endif %}
diff --git a/roles/os-horizon/templates/10_host.py.j2 b/roles/os-horizon/templates/10_host.py.j2
index 260c08e..68b12c2 100644
--- a/roles/os-horizon/templates/10_host.py.j2
+++ b/roles/os-horizon/templates/10_host.py.j2
@@ -1,4 +1,4 @@
-OPENSTACK_HOST = "{{ groups['openstack_identity'][0] }}"
+OPENSTACK_HOST = "{{ keystone_fqdn }}"
 OPENSTACK_KEYSTONE_URL = "{{keystone_protocol}}://%s:{{keystone_public_port}}/v3" % OPENSTACK_HOST
 {% if keystone_ssl %}
 OPENSTACK_SSL_NO_VERIFY = True
diff --git a/roles/os-keystone/README.md b/roles/os-keystone/README.md
index 949177e..ccf6bc7 100644
--- a/roles/os-keystone/README.md
+++ b/roles/os-keystone/README.md
@@ -9,6 +9,9 @@ All variables of this role are defined in `defaults/main.yml`
 
 ## Mandatory variables
 * `keystone_database_password`
+* `keystone_fqdn`
+* `keystone_root_domain`
+* `keystone_p12password`
 
 ## Handlers
 
diff --git a/roles/os-keystone/defaults/main.yml b/roles/os-keystone/defaults/main.yml
index 4251167..5bc49b2 100644
--- a/roles/os-keystone/defaults/main.yml
+++ b/roles/os-keystone/defaults/main.yml
@@ -17,7 +17,7 @@
 # keystone_database_password: <password>
 
 # You can tune the following variables when keystone_ssl is set yo yes
-keystone_ssl: False
+keystone_ssl: True
 keystone_fqdn: "{{ ansible_fqdn }}"
 keystone_root_domain: "example.com"
 keystone_p12password: "secret"
diff --git a/roles/os-keystone/tasks/keystone_bootstrap.yml b/roles/os-keystone/tasks/keystone_bootstrap.yml
index c6dce4f..ade89d6 100644
--- a/roles/os-keystone/tasks/keystone_bootstrap.yml
+++ b/roles/os-keystone/tasks/keystone_bootstrap.yml
@@ -21,8 +21,8 @@
       --bootstrap-project-name admin
       --bootstrap-role-name admin
       --bootstrap-service-name keystone
-      --bootstrap-admin-url "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
-      --bootstrap-public-url "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}/v3"
-      --bootstrap-internal-url "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}/v3"
+      --bootstrap-admin-url "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
+      --bootstrap-public-url "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}/v3"
+      --bootstrap-internal-url "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}/v3"
     become: yes
     become_user: keystone
diff --git a/roles/os-keystone/tasks/keystone_project_access.yml b/roles/os-keystone/tasks/keystone_project_access.yml
index ab54d02..a07ea99 100644
--- a/roles/os-keystone/tasks/keystone_project_access.yml
+++ b/roles/os-keystone/tasks/keystone_project_access.yml
@@ -19,7 +19,7 @@
       project_name: "{{ item.name }}"
       domain_name: Default
       description: "{{ item.desc }}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -33,7 +33,7 @@
       project_name: "{{ item.project_name }}"
       domain_name: Default
       description: "{{ item.description | default('') }}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -44,7 +44,7 @@
     keystone:
       command: "ensure_role"
       role_name: "user"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -54,7 +54,7 @@
     keystone:
       command: "ensure_role"
       role_name: "{{ item }}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -69,7 +69,7 @@
       password: "{{ item.password }}"
       email: "{{ item.email | default('') }}"
       domain_name: "Default"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -83,7 +83,7 @@
       user_name: "{{ item.user_name }}"
       project_name: "{{ item.project_name }}"
       role_name: "{{ item.role_name }}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: "admin"
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
diff --git a/roles/os-keystone/tasks/keystone_service_entities.yml b/roles/os-keystone/tasks/keystone_service_entities.yml
index afe79ad..cc794c6 100644
--- a/roles/os-keystone/tasks/keystone_service_entities.yml
+++ b/roles/os-keystone/tasks/keystone_service_entities.yml
@@ -19,7 +19,7 @@
       service_name: "keystone"
       service_type: "identity"
       description: "OpenStack Identity"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: admin
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -31,7 +31,7 @@
       service_name: "{{item.service_name}}"
       service_type: "{{item.service_type}}"
       description: "{{item.description | default('')}}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: "admin"
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
@@ -45,13 +45,13 @@
       service_name: "keystone"
       service_type: "identity"
       endpoint_list:
-        - url: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}/v3"
+        - url: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}/v3"
           interface: "public"
-        - url: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+        - url: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
           interface: "admin"
-        - url: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}/v3"
+        - url: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}/v3"
           interface: "internal"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       login_user: "admin"
       login_password: "{{ keystone_admin_password }}"
       login_project_name: "admin"
diff --git a/roles/os-keystone/templates/openrc.j2 b/roles/os-keystone/templates/openrc.j2
index ea68f4c..587acdc 100644
--- a/roles/os-keystone/templates/openrc.j2
+++ b/roles/os-keystone/templates/openrc.j2
@@ -6,7 +6,7 @@ export OS_PROJECT_NAME=admin
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD={{ keystone_admin_password }}
-export OS_AUTH_URL={{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3
+export OS_AUTH_URL={{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3
 {% if keystone_ssl %}
 export OS_CACERT=$HOME/.pki/cacert.pem
 {% endif %}
diff --git a/roles/os-neutron/tasks/neutron_project_access.yml b/roles/os-neutron/tasks/neutron_project_access.yml
index fad6bde..4524a25 100644
--- a/roles/os-neutron/tasks/neutron_project_access.yml
+++ b/roles/os-neutron/tasks/neutron_project_access.yml
@@ -25,7 +25,7 @@
       password: "{{ neutron_user_password  }}"
       domain_name: "Default"
       email: "{{item.name}}@example.com"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { name: "neutron", project: "admin" }
@@ -40,7 +40,7 @@
       user_name: "{{item.user}}"
       project_name: "{{item.project}}"
       role_name: "{{item.role}}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { user: "neutron", project: "service", role: "admin"}
diff --git a/roles/os-neutron/tasks/neutron_service_entities.yml b/roles/os-neutron/tasks/neutron_service_entities.yml
index df62bac..8b512ae 100644
--- a/roles/os-neutron/tasks/neutron_service_entities.yml
+++ b/roles/os-neutron/tasks/neutron_service_entities.yml
@@ -23,7 +23,7 @@
       service_name: "neutron"
       service_type: "network"
       description: "OpenStack Networking"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
 
   - name: Create neutron endpoints
@@ -43,5 +43,5 @@
           interface: "internal"
         - url: "http://{{ groups['openstack_networking'][0] }}:9696"
           interface: "admin"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
diff --git a/roles/os-neutron/templates/metadata_agent.ini.j2 b/roles/os-neutron/templates/metadata_agent.ini.j2
index 6d25603..b3e3806 100644
--- a/roles/os-neutron/templates/metadata_agent.ini.j2
+++ b/roles/os-neutron/templates/metadata_agent.ini.j2
@@ -1,6 +1,6 @@
 [DEFAULT]
-auth_uri = "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}"
-auth_url = "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}"
+auth_uri = "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}"
+auth_url = "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}"
 auth_region = RegionOne
 auth_plugin = password
 project_domain_id = default
diff --git a/roles/os-neutron/templates/neutron.conf.j2 b/roles/os-neutron/templates/neutron.conf.j2
index 414f7a6..d38c704 100644
--- a/roles/os-neutron/templates/neutron.conf.j2
+++ b/roles/os-neutron/templates/neutron.conf.j2
@@ -15,20 +15,20 @@ nova_url = http://{{ groups['openstack_compute_controller'][0] }}:8774/v2
 connection = mysql+pymysql://neutron:{{ neutron_database_password }}@{{ groups['dbservers'][0] }}/neutron
 
 [keystone_authtoken]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
 project_domain_id = default
 project_name = service
 user_domain_id = default
 password = {{ neutron_user_password }}
 username = neutron
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 {% if keystone_ssl %}
 insecure = True
 {% endif %}
 
 [nova]
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
diff --git a/roles/os-nova/tasks/nova_project_access.yml b/roles/os-nova/tasks/nova_project_access.yml
index 4190fdc..2f1c035 100644
--- a/roles/os-nova/tasks/nova_project_access.yml
+++ b/roles/os-nova/tasks/nova_project_access.yml
@@ -25,7 +25,7 @@
       password: "{{ nova_user_password  }}"
       domain_name: "Default"
       email: "{{item.name}}@example.com"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { name: "nova", project: "admin" }
@@ -40,7 +40,7 @@
       user_name: "{{item.user}}"
       project_name: "{{item.project}}"
       role_name: "{{item.role}}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { user: "nova", project: "service", role: "admin"}
diff --git a/roles/os-nova/tasks/nova_service_entities.yml b/roles/os-nova/tasks/nova_service_entities.yml
index 0555ec0..4ad6566 100644
--- a/roles/os-nova/tasks/nova_service_entities.yml
+++ b/roles/os-nova/tasks/nova_service_entities.yml
@@ -23,7 +23,7 @@
       service_name: "nova"
       service_type: "compute"
       description: "Nova Compute Service"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
 
   - name: Create nova endpoints
@@ -43,5 +43,5 @@
           interface: "internal"
         - url: "http://{{ groups['openstack_compute_controller'][0] }}:8774/v2/%(tenant_id)s"
           interface: "admin"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
diff --git a/roles/os-nova/templates/neutron.conf.j2 b/roles/os-nova/templates/neutron.conf.j2
index a9dd540..9eebc73 100644
--- a/roles/os-nova/templates/neutron.conf.j2
+++ b/roles/os-nova/templates/neutron.conf.j2
@@ -8,8 +8,8 @@ rabbit_userid = openstack
 rabbit_password = {{ rabbitmq_password }}
 
 [keystone_authtoken]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
diff --git a/roles/os-nova/templates/nova.conf.j2 b/roles/os-nova/templates/nova.conf.j2
index 5d43c39..3c27afd 100644
--- a/roles/os-nova/templates/nova.conf.j2
+++ b/roles/os-nova/templates/nova.conf.j2
@@ -23,8 +23,8 @@ rabbit_userid = {{ rabbitmq_username }}
 rabbit_password = {{ rabbitmq_password }}
 
 [keystone_authtoken]
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
@@ -49,7 +49,7 @@ api_servers = http://{{ groups['openstack_image'][0] }}:9292
 
 [neutron]
 url = http://{{ groups['openstack_networking'][0] }}:9696
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3
 auth_type = password
 auth_strategy = keystone
 project_domain_name = Default
diff --git a/roles/os-swift/tasks/swift_project_access.yml b/roles/os-swift/tasks/swift_project_access.yml
index fbc3aad..45b4d5d 100644
--- a/roles/os-swift/tasks/swift_project_access.yml
+++ b/roles/os-swift/tasks/swift_project_access.yml
@@ -25,7 +25,7 @@
       password: "{{ swift_user_password  }}"
       domain_name: "Default"
       email: "{{item.name}}@example.com"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { name: "swift", project: "admin" }
@@ -40,7 +40,7 @@
       user_name: "{{item.user}}"
       project_name: "{{item.project}}"
       role_name: "{{item.role}}"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
     with_items:
       - { user: "swift", project: "service", role: "admin"}
diff --git a/roles/os-swift/tasks/swift_service_entities.yml b/roles/os-swift/tasks/swift_service_entities.yml
index 45122d1..787b314 100644
--- a/roles/os-swift/tasks/swift_service_entities.yml
+++ b/roles/os-swift/tasks/swift_service_entities.yml
@@ -23,7 +23,7 @@
       service_name: "swift"
       service_type: "object-store"
       description: "Openstack Object Storage"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
 
   - name: Create swift endpoints
@@ -43,5 +43,5 @@
           interface: "internal"
         - url: "http://{{ groups['openstack_object_storage_controller'][0] }}:8080/v1"
           interface: "admin"
-      endpoint: "{{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}/v3"
+      endpoint: "{{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}/v3"
       insecure: yes
diff --git a/roles/os-swift/templates/proxy-server.conf.j2 b/roles/os-swift/templates/proxy-server.conf.j2
index 28749f4..f3f6578 100644
--- a/roles/os-swift/templates/proxy-server.conf.j2
+++ b/roles/os-swift/templates/proxy-server.conf.j2
@@ -20,8 +20,8 @@ operator_roles = admin,user
 
 [filter:authtoken]
 paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-auth_uri = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_public_port}}
-auth_url = {{keystone_protocol}}://{{ groups['openstack_identity'][0] }}:{{keystone_admin_port}}
+auth_uri = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_public_port}}
+auth_url = {{keystone_protocol}}://{{ keystone_fqdn }}:{{keystone_admin_port}}
 memcached_servers = {{ groups['openstack_object_storage_controller'][0] }}:11211
 auth_type = password
 project_domain_id = default