diff --git a/README.md b/README.md
index ff1b5735..d5569089 100644
--- a/README.md
+++ b/README.md
@@ -50,13 +50,13 @@ To utilize the glance module's functionality you will need to declare multiple r
 ```puppet
 class { 'glance::api::authtoken':
   password => '12345',
-  auth_url => 'http://172.17.0.3:35357',
+  auth_url => 'http://172.17.0.3:5000',
   auth_uri => 'http://172.17.0.3:5000',
 }
 
 class { 'glance::registry::authtoken':
   password => '12345',
-  auth_url => 'http://172.17.0.3:35357',
+  auth_url => 'http://172.17.0.3:5000',
   auth_uri => 'http://172.17.0.3:5000',
 }
 
diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp
index 88d0a848..ba281b34 100644
--- a/manifests/api/authtoken.pp
+++ b/manifests/api/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 glance::api::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
-  $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/manifests/registry/authtoken.pp b/manifests/registry/authtoken.pp
index c3045aa7..7f5474eb 100644
--- a/manifests/registry/authtoken.pp
+++ b/manifests/registry/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 glance::registry::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
-  $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/glance_api_authtoken_spec.rb b/spec/classes/glance_api_authtoken_spec.rb
index 406d974f..bf8417f8 100644
--- a/spec/classes/glance_api_authtoken_spec.rb
+++ b/spec/classes/glance_api_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'glance::api::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_glance_api_config('keystone_authtoken/username').with_value('glance')
         is_expected.to contain_glance_api_config('keystone_authtoken/password').with_value('glance_api_password')
-        is_expected.to contain_glance_api_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357')
+        is_expected.to contain_glance_api_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000')
         is_expected.to contain_glance_api_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_glance_api_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_glance_api_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'glance::api::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',
diff --git a/spec/classes/glance_registry_authtoken_spec.rb b/spec/classes/glance_registry_authtoken_spec.rb
index bbd89a7d..f964f903 100644
--- a/spec/classes/glance_registry_authtoken_spec.rb
+++ b/spec/classes/glance_registry_authtoken_spec.rb
@@ -13,7 +13,7 @@ describe 'glance::registry::authtoken' do
       it 'configure keystone_authtoken' do
         is_expected.to contain_glance_registry_config('keystone_authtoken/username').with_value('glance')
         is_expected.to contain_glance_registry_config('keystone_authtoken/password').with_value('glance_registry_password')
-        is_expected.to contain_glance_registry_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357')
+        is_expected.to contain_glance_registry_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000')
         is_expected.to contain_glance_registry_config('keystone_authtoken/project_name').with_value('services')
         is_expected.to contain_glance_registry_config('keystone_authtoken/user_domain_name').with_value('Default')
         is_expected.to contain_glance_registry_config('keystone_authtoken/project_domain_name').with_value('Default')
@@ -53,7 +53,7 @@ describe 'glance::registry::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',
diff --git a/spec/unit/provider/glance_image_spec.rb b/spec/unit/provider/glance_image_spec.rb
index 3edbdc06..aaded117 100644
--- a/spec/unit/provider/glance_image_spec.rb
+++ b/spec/unit/provider/glance_image_spec.rb
@@ -10,7 +10,7 @@ describe provider_class do
     ENV['OS_USERNAME']     = 'test'
     ENV['OS_PASSWORD']     = 'abc123'
     ENV['OS_PROJECT_NAME'] = 'test'
-    ENV['OS_AUTH_URL']     = 'http://127.0.0.1:35357/v2.0'
+    ENV['OS_AUTH_URL']     = 'http://127.0.0.1:5000/v2.0'
   end
 
   describe 'when managing an image' do