diff --git a/manifests/api.pp b/manifests/api.pp
index 8c86f21..27e487b 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -23,7 +23,7 @@
 #
 # [*watcher_client_auth_url*]
 #   Specifies the admin Identity URI for Watcher to use.
-#   Default 'http://localhost:35357/'
+#   Default 'http://localhost:5000/'
 #
 # [*package_ensure*]
 #   (Optional)Ensure state of the openstackclient package.
@@ -139,7 +139,7 @@ class watcher::api (
   $watcher_client_password,
   $watcher_client_username            = 'watcher',
   $watcher_client_auth_uri            = 'http://localhost:5000/',
-  $watcher_client_auth_url            = 'http://localhost:35357/',
+  $watcher_client_auth_url            = 'http://localhost:5000/',
   $package_ensure                     = 'present',
   $enabled                            = true,
   $manage_service                     = true,
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 0423e94..10b5ac1 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
@@ -189,7 +189,7 @@
 class watcher::keystone::authtoken (
   $password                       = $::os_service_default,
   $username                       = 'watcher',
-  $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/watcher_api_spec.rb b/spec/classes/watcher_api_spec.rb
index 90b669f..e5eb0a2 100644
--- a/spec/classes/watcher_api_spec.rb
+++ b/spec/classes/watcher_api_spec.rb
@@ -93,7 +93,7 @@ describe 'watcher::api' do
       it 'configures watcher clients auth' do
         is_expected.to contain_watcher_config('watcher_clients_auth/username').with_value('watcher')
         is_expected.to contain_watcher_config('watcher_clients_auth/password').with_value( params[:watcher_client_password] )
-        is_expected.to contain_watcher_config('watcher_clients_auth/auth_url').with_value('http://localhost:35357/')
+        is_expected.to contain_watcher_config('watcher_clients_auth/auth_url').with_value('http://localhost:5000/')
         is_expected.to contain_watcher_config('watcher_clients_auth/auth_uri').with_value('http://localhost:5000/')
         is_expected.to contain_watcher_config('watcher_clients_auth/project_name').with_value('service')
         is_expected.to contain_watcher_config('watcher_clients_auth/project_domain_name').with_value('<SERVICE DEFAULT>')
diff --git a/spec/classes/watcher_keystone_authtoken_spec.rb b/spec/classes/watcher_keystone_authtoken_spec.rb
index dd49425..8f42456 100644
--- a/spec/classes/watcher_keystone_authtoken_spec.rb
+++ b/spec/classes/watcher_keystone_authtoken_spec.rb
@@ -17,7 +17,7 @@ describe 'watcher::keystone::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_watcher_config('keystone_authtoken/username').with_value('watcher')
         is_expected.to contain_watcher_config('keystone_authtoken/password').with_value('watcher_password')
-        is_expected.to contain_watcher_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
+        is_expected.to contain_watcher_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
         is_expected.to contain_watcher_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_watcher_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_watcher_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -57,7 +57,7 @@ describe 'watcher::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',