diff --git a/puppet-{{cookiecutter.project_name}}/manifests/keystone/authtoken.pp b/puppet-{{cookiecutter.project_name}}/manifests/keystone/authtoken.pp
index ebfa7f5..28afcae 100644
--- a/puppet-{{cookiecutter.project_name}}/manifests/keystone/authtoken.pp
+++ b/puppet-{{cookiecutter.project_name}}/manifests/keystone/authtoken.pp
@@ -21,11 +21,11 @@
 #
 # [*user_domain_name*]
 #   (Optional) Name of domain for $username
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*project_domain_name*]
 #   (Optional) Name of domain for $project_name
-#   Defaults to $::os_service_default
+#   Defaults to 'Default'
 #
 # [*insecure*]
 #   (Optional) If true, explicitly allow TLS without checking server cert
@@ -182,8 +182,8 @@ class {{cookiecutter.project_name}}::keystone::authtoken(
   $username                       = '{{cookiecutter.project_name}}',
   $auth_url                       = 'http://localhost:35357',
   $project_name                   = 'services',
-  $user_domain_name               = $::os_service_default,
-  $project_domain_name            = $::os_service_default,
+  $user_domain_name               = 'Default',
+  $project_domain_name            = 'Default',
   $insecure                       = $::os_service_default,
   $auth_section                   = $::os_service_default,
   $auth_type                      = 'password',
diff --git a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_keystone_authtoken_spec.rb b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_keystone_authtoken_spec.rb
index 4251496..59b986b 100644
--- a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_keystone_authtoken_spec.rb
+++ b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_keystone_authtoken_spec.rb
@@ -15,8 +15,8 @@ describe '{{cookiecutter.project_name}}::keystone::authtoken' do
         is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/password').with_value('secrete')
         is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
         is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/project_name').with_value('services')
-        is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/user_domain_name').with_value('Default')
+        is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/project_domain_name').with_value('Default')
         is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_type').with_value('password')