diff --git a/chef/cookbooks/ceph/recipes/radosgw_keystone.rb b/chef/cookbooks/ceph/recipes/radosgw_keystone.rb
index 68bbcd3..35e11d3 100644
--- a/chef/cookbooks/ceph/recipes/radosgw_keystone.rb
+++ b/chef/cookbooks/ceph/recipes/radosgw_keystone.rb
@@ -4,7 +4,8 @@
 keystone_settings = KeystoneHelper.keystone_settings(node, @cookbook_name)
 register_auth_hash = { user: keystone_settings["admin_user"],
                        password: keystone_settings["admin_password"],
-                       tenant: keystone_settings["admin_tenant"] }
+                       domain: keystone_settings["admin_domain"],
+                       project: keystone_settings["admin_project"] }
 
 crowbar_pacemaker_sync_mark "wait-radosgw_register"
 
@@ -25,7 +26,7 @@
   auth register_auth_hash
   user_name keystone_settings["service_user"]
   user_password keystone_settings["service_password"]
-  tenant_name keystone_settings["service_tenant"]
+  project_name keystone_settings["service_tenant"]
   action :add_user
 end
 
@@ -36,7 +37,7 @@
   port keystone_settings["admin_port"]
   auth register_auth_hash
   user_name keystone_settings["service_user"]
-  tenant_name keystone_settings["service_tenant"]
+  project_name keystone_settings["service_tenant"]
   role_name "admin"
   action :add_access
 end
diff --git a/chef/cookbooks/ceph/templates/default/ceph.conf.erb b/chef/cookbooks/ceph/templates/default/ceph.conf.erb
index 6d5501c..981d198 100644
--- a/chef/cookbooks/ceph/templates/default/ceph.conf.erb
+++ b/chef/cookbooks/ceph/templates/default/ceph.conf.erb
@@ -132,7 +132,8 @@
   <% unless node[:ceph][:keystone_instance].nil? || node[:ceph][:keystone_instance].empty? || @keystone_settings.empty? -%>
   rgw keystone url =  <%= @keystone_settings['admin_auth_url'] %>
   rgw keystone admin user = <%= @keystone_settings['service_user'] %>
-  rgw keystone admin tenant = <%= @keystone_settings['service_tenant'] %>
+  rgw keystone admin domain = <%= @keystone_settings['admin_domain'] %>
+  rgw keystone admin project = <%= @keystone_settings['admin_project'] %>
   rgw keystone admin password = <%= @keystone_settings['service_password'] %>
 <% if @keystone_settings['insecure'] -%>
   rgw keystone verify ssl = false