diff --git a/heat/files/pike/heat.conf.Debian b/heat/files/pike/heat.conf.Debian
index 74f8fbf..8132afa 100644
--- a/heat/files/pike/heat.conf.Debian
+++ b/heat/files/pike/heat.conf.Debian
@@ -1299,7 +1299,7 @@
 #
 
 # Authentication Endpoint URI. (string value)
-auth_uri={{ server.identity.get('protocol', 'http') }}://{{ server.identity.host }}:5000/v2.0
+auth_uri={{ server.identity.get('protocol', 'http') }}://{{ server.identity.host }}:5000
 
 # Allow orchestration of multiple clouds. (boolean value)
 #multi_cloud=false
@@ -1311,7 +1311,7 @@
 {%- if server.identity.get('protocol', 'http') == 'https' %}
 ca_file = {{ server.identity.get('cacert_file', server.cacert_file) }}
 {%- endif %}
-keystone_ec2_uri={{ server.identity.get('protocol', 'http') }}://{{ server.identity.host }}:5000/v2.0/ec2tokens
+keystone_ec2_uri={{ server.identity.get('protocol', 'http') }}://{{ server.identity.host }}:5000/v3/ec2tokens
 
 [clients]
 endpoint_type = {{ server.identity.get('endpoint_type_default', 'publicURL') }}
@@ -1747,7 +1747,7 @@
 # Config Section from which to load plugin specific options (string value)
 #auth_section = <None>
 auth_type = password
-auth_uri={{ server.identity.get('protocol', 'http') }}://{{ server.identity.host }}:5000/v2.0
+auth_uri={{ server.identity.get('protocol', 'http') }}://{{ server.identity.host }}:5000
 {%- if server.identity.get('protocol', 'http') == 'https' %}
 cafile={{ server.identity.get('cacert_file', server.cacert_file) }}
 {%- endif %}