diff --git a/examples/site.pp b/examples/site.pp
index f0807b05..47359c07 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -14,7 +14,7 @@ class { '::gnocchi':
 
 class { '::gnocchi::api':
   bind_host         => '10.0.0.1',
-  identity_uri      => 'https://identity.openstack.org:35357',
+  identity_uri      => 'https://identity.openstack.org:5000',
   keystone_password => 'verysecrete'
 }
 
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 6123a2ee..c7f07800 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://localhost:35357'
+#   Defaults to 'http://localhost:5000'
 #
 # [*project_name*]
 #   (Optional) Service project name
@@ -187,7 +187,7 @@
 class gnocchi::keystone::authtoken(
   $username                       = 'gnocchi',
   $password                       = $::os_service_default,
-  $auth_url                       = 'http://localhost:35357',
+  $auth_url                       = 'http://localhost:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
   $project_domain_name            = 'Default',
diff --git a/spec/classes/gnocchi_keystone_authtoken_spec.rb b/spec/classes/gnocchi_keystone_authtoken_spec.rb
index eb880b69..9e8452c6 100644
--- a/spec/classes/gnocchi_keystone_authtoken_spec.rb
+++ b/spec/classes/gnocchi_keystone_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'gnocchi::keystone::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_gnocchi_config('keystone_authtoken/username').with_value('gnocchi')
         is_expected.to contain_gnocchi_config('keystone_authtoken/password').with_value('gnocchi_password')
-        is_expected.to contain_gnocchi_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
+        is_expected.to contain_gnocchi_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
         is_expected.to contain_gnocchi_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_gnocchi_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_gnocchi_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'gnocchi::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',