diff --git a/manifests/keymaster.pp b/manifests/keymaster.pp
index beafaeb6..683a26a3 100644
--- a/manifests/keymaster.pp
+++ b/manifests/keymaster.pp
@@ -71,13 +71,13 @@
 class swift::keymaster(
   String[1] $password,
   $api_class             = 'barbican',
-  $key_id                = undef,
+  $key_id                = $facts['os_service_default'],
   $username              = 'swift',
   $project_name          = 'services',
-  $project_id            = undef,
-  $auth_endpoint         = undef,
-  $project_domain_name   = undef,
-  $user_domain_name      = undef,
+  $project_id            = $facts['os_service_default'],
+  $auth_endpoint         = $facts['os_service_default'],
+  $project_domain_name   = $facts['os_service_default'],
+  $user_domain_name      = $facts['os_service_default'],
   $project_domain_id     = 'default',
   $user_domain_id        = 'default',
   $meta_version_to_write = $facts['os_service_default'],
diff --git a/spec/classes/swift_keymaster_spec.rb b/spec/classes/swift_keymaster_spec.rb
index c8f0c339..a7590f95 100644
--- a/spec/classes/swift_keymaster_spec.rb
+++ b/spec/classes/swift_keymaster_spec.rb
@@ -11,9 +11,14 @@ describe 'swift::keymaster' do
     context "when using default parameters" do
       it 'configures keymaster options' do
         is_expected.to contain_swift_keymaster_config('kms_keymaster/api_class').with_value('barbican')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/key_id').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/username').with_value('swift')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/password').with_value('swiftpassword').with_secret(true)
         is_expected.to contain_swift_keymaster_config('kms_keymaster/project_name').with_value('services')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/project_id').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/auth_endpoint').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/project_domain_name').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/user_domain_name').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/project_domain_id').with_value('default')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/user_domain_id').with_value('default')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('<SERVICE DEFAULT>')
@@ -27,6 +32,8 @@ describe 'swift::keymaster' do
           :key_id                => 'dummy_key_id',
           :auth_endpoint         => 'http://127.0.0.1:5000',
           :project_name          => 'barbican_swift_service',
+          :project_domain_name   => 'Default',
+          :user_domain_name      => 'Default',
           :meta_version_to_write => 3,
         })
       end
@@ -34,8 +41,10 @@ describe 'swift::keymaster' do
       it 'configures keymaster options' do
         is_expected.to contain_swift_keymaster_config('kms_keymaster/api_class').with_value('castellan.key_manager.barbican_key_manager.BarbicanKeyManager')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/key_id').with_value('dummy_key_id')
-        is_expected.to contain_swift_keymaster_config('kms_keymaster/auth_endpoint').with_value('http://127.0.0.1:5000')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/project_name').with_value('barbican_swift_service')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/auth_endpoint').with_value('http://127.0.0.1:5000')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/project_domain_name').with_value('Default')
+        is_expected.to contain_swift_keymaster_config('kms_keymaster/user_domain_name').with_value('Default')
         is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('3')
       end
     end