diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 5ee68ea295..f58ac73dd6 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -418,9 +418,9 @@ kibana_user: "kibana"
 ####################
 # Keystone options
 ####################
-keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3"
-keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3"
-keystone_public_url: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}/v3"
+keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}"
+keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}"
+keystone_public_url: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}"
 
 # Valid options are [ uuid, fernet ]
 keystone_token_provider: "uuid"
diff --git a/ansible/roles/keystone/tasks/update_endpoints.yml b/ansible/roles/keystone/tasks/update_endpoints.yml
new file mode 100644
index 0000000000..7cf9466ae0
--- /dev/null
+++ b/ansible/roles/keystone/tasks/update_endpoints.yml
@@ -0,0 +1,21 @@
+---
+- name: Updating keystone endpoints
+  kolla_toolbox:
+    module_name: "kolla_keystone_service"
+    module_args:
+      service_name: "keystone"
+      service_type: "identity"
+      description: "Identity Service"
+      endpoint_region: "{{ openstack_region_name }}"
+      url: "{{ item.url }}"
+      interface: "{{ item.interface }}"
+      region_name: "{{ openstack_region_name }}"
+      auth: "{{ '{{ openstack_keystone_auth }}' }}"
+    module_extra_vars:
+      openstack_keystone_auth: "{{ openstack_keystone_auth }}"
+  run_once: True
+  register: update
+  with_items:
+    - {'interface': 'admin', 'url': '{{ keystone_admin_url }}'}
+    - {'interface': 'internal', 'url': '{{ keystone_internal_url }}'}
+    - {'interface': 'public', 'url': '{{ keystone_public_url }}'}
diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml
index c38db1adf4..64066f97f5 100644
--- a/ansible/roles/keystone/tasks/upgrade.yml
+++ b/ansible/roles/keystone/tasks/upgrade.yml
@@ -5,3 +5,6 @@
 
 - name: Flush handlers
   meta: flush_handlers
+
+#NOTE(egonzalez): Remove after Pike is released
+- include: update_endpoints.yml