diff --git a/README.md b/README.md
index 421fd577..46daf2f9 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ class { '::heat':
   rabbit_password     => 'an_even_bigger_secret',
   rabbit_host         => '127.0.0.1',
   database_connection => 'mysql+pymysql://heat:a_big_secret@127.0.0.1/heat?charset=utf8',
-  identity_uri        => 'http://127.0.0.1:35357/',
+  identity_uri        => 'http://127.0.0.1:5000/',
   keystone_password   => 'a_big_secret',
 }
 
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 22b26f0d..5806f348 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -14,7 +14,7 @@
 #
 # [*auth_url*]
 #   (Optional) The URL to use for authentication.
-#   Defaults to 'http://127.0.0.1:35357/'
+#   Defaults to 'http://127.0.0.1:5000/'
 #
 # [*project_name*]
 #   (Optional) Service project name
@@ -187,7 +187,7 @@
 class heat::keystone::authtoken(
   $password                       = $::os_service_default,
   $username                       = 'heat',
-  $auth_url                       = 'http://127.0.0.1:35357/',
+  $auth_url                       = 'http://127.0.0.1:5000/',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
   $project_domain_name            = 'Default',
diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb
index b79932ba..f91f966e 100644
--- a/spec/classes/heat_init_spec.rb
+++ b/spec/classes/heat_init_spec.rb
@@ -126,7 +126,7 @@ describe 'heat' do
     end
 
     it 'configures auth_url' do
-      is_expected.to contain_heat_config('trustee/auth_url').with_value( 'http://127.0.0.1:35357/' )
+      is_expected.to contain_heat_config('trustee/auth_url').with_value( 'http://127.0.0.1:5000/' )
     end
 
     it 'configures username' do
@@ -373,12 +373,12 @@ describe 'heat' do
   shared_examples_for 'with ec2authtoken auth uri set' do
     before do
       params.merge!(
-        :keystone_ec2_uri => 'http://1.2.3.4:35357/v2.0/ec2tokens'
+        :keystone_ec2_uri => 'http://1.2.3.4:5000/v2.0/ec2tokens'
       )
     end
 
     it do
-      is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value('http://1.2.3.4:35357/v2.0/ec2tokens')
+      is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value('http://1.2.3.4:5000/v2.0/ec2tokens')
     end
   end
 
diff --git a/spec/classes/heat_keystone_authtoken_spec.rb b/spec/classes/heat_keystone_authtoken_spec.rb
index 499d0604..45d4b5f7 100644
--- a/spec/classes/heat_keystone_authtoken_spec.rb
+++ b/spec/classes/heat_keystone_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'heat::keystone::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_heat_config('keystone_authtoken/username').with_value('heat')
         is_expected.to contain_heat_config('keystone_authtoken/password').with_value('heat_password')
-        is_expected.to contain_heat_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/')
+        is_expected.to contain_heat_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000/')
         is_expected.to contain_heat_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_heat_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_heat_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'heat::keystone::authtoken' do
           :www_authenticate_uri                 => 'https://10.0.0.1:9999/',
           :username                             => 'myuser',
           :password                             => 'mypasswd',
-          :auth_url                             => 'http://:127.0.0.1:35357',
+          :auth_url                             => 'http://:127.0.0.1:5000',
           :project_name                         => 'service_project',
           :user_domain_name                     => 'domainX',
           :project_domain_name                  => 'domainX',