diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp
index 14dfd5c..6650df9 100644
--- a/manifests/auth_file.pp
+++ b/manifests/auth_file.pp
@@ -22,7 +22,7 @@
 #
 # [*service_endpoint*]
 #   (optional) Keystone service endpoint
-#   Defaults to 'http://127.0.0.1:35357/v3/'
+#   Defaults to 'http://127.0.0.1:5000/v3/'
 #
 # [*username*]
 #   (optional) Username for this account as defined in keystone
@@ -122,7 +122,7 @@ class openstack_extras::auth_file(
   $password                 = undef,
   $auth_url                 = 'http://127.0.0.1:5000/v3/',
   $service_token            = undef,
-  $service_endpoint         = 'http://127.0.0.1:35357/v3/',
+  $service_endpoint         = 'http://127.0.0.1:5000/v3/',
   $username                 = 'admin',
   $tenant_name              = undef,
   $project_name             = 'openstack',
diff --git a/spec/classes/openstack_extras_auth_file_spec.rb b/spec/classes/openstack_extras_auth_file_spec.rb
index 8a8d96f..5d070bb 100644
--- a/spec/classes/openstack_extras_auth_file_spec.rb
+++ b/spec/classes/openstack_extras_auth_file_spec.rb
@@ -38,7 +38,7 @@ describe 'openstack_extras::auth_file' do
         :password                 => 'admin',
         :auth_url                 => 'http://127.0.0.2:5000/v3/',
         :service_token            => 'servicetoken',
-        :service_endpoint         => 'http://127.0.0.2:35357/v3/',
+        :service_endpoint         => 'http://127.0.0.2:5000/v3/',
         :username                 => 'myuser',
         :tenant_name              => 'mytenant',
         :project_name             => 'myproject',
@@ -66,7 +66,7 @@ describe 'openstack_extras::auth_file' do
     it 'should create a openrc file' do
       verify_contents(catalogue, '/root/openrc', [
         'export OS_SERVICE_TOKEN=\'servicetoken\'',
-        'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:35357/v3/\'',
+        'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:5000/v3/\'',
         'export OS_NO_CACHE=\'false\'',
         'export OS_TENANT_NAME=\'mytenant\'',
         'export OS_PROJECT_NAME=\'myproject\'',
diff --git a/spec/unit/puppet/provider/cib.xml b/spec/unit/puppet/provider/cib.xml
index 4fdbf3d..497c23a 100644
--- a/spec/unit/puppet/provider/cib.xml
+++ b/spec/unit/puppet/provider/cib.xml
@@ -136,7 +136,7 @@
       </clone>
       <primitive class="ocf" id="p_neutron-dhcp-agent" provider="pacemaker" type="neutron-agent-dhcp">
         <instance_attributes id="p_neutron-dhcp-agent-instance_attributes">
-          <nvpair id="p_neutron-dhcp-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:35357/v2.0"/>
+          <nvpair id="p_neutron-dhcp-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:5000/v2.0"/>
           <nvpair id="p_neutron-dhcp-agent-instance_attributes-amqp_server_port" name="amqp_server_port" value="5673"/>
           <nvpair id="p_neutron-dhcp-agent-instance_attributes-multiple_agents" name="multiple_agents" value="false"/>
           <nvpair id="p_neutron-dhcp-agent-instance_attributes-password" name="password" value="7BqMhboS"/>
@@ -180,7 +180,7 @@
         </meta_attributes>
         <primitive class="ocf" id="p_neutron-l3-agent" provider="pacemaker" type="neutron-agent-l3">
           <instance_attributes id="p_neutron-l3-agent-instance_attributes">
-            <nvpair id="p_neutron-l3-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:35357/v2.0"/>
+            <nvpair id="p_neutron-l3-agent-instance_attributes-os_auth_url" name="os_auth_url" value="http://10.108.2.2:5000/v2.0"/>
             <nvpair id="p_neutron-l3-agent-instance_attributes-multiple_agents" name="multiple_agents" value="true"/>
             <nvpair id="p_neutron-l3-agent-instance_attributes-syslog" name="syslog" value="true"/>
             <nvpair id="p_neutron-l3-agent-instance_attributes-password" name="password" value="7BqMhboS"/>