diff --git a/chef/cookbooks/ceph/templates/default/ceph.conf.erb b/chef/cookbooks/ceph/templates/default/ceph.conf.erb
index 6d5501c..425dfbb 100644
--- a/chef/cookbooks/ceph/templates/default/ceph.conf.erb
+++ b/chef/cookbooks/ceph/templates/default/ceph.conf.erb
@@ -138,6 +138,8 @@
   rgw keystone verify ssl = false
 <% end -%>
   nss db path = <%= node['ceph']['radosgw']['nss_directory'] %>
+  # TODO only enable this when openstack-ec2 is enabled
+  rgw s3 auth use keystone = true
   <% end -%>
 <% if (! node['ceph']['config']['rgw'].nil?) -%>
   <% node['ceph']['config']['rgw'].sort.each do |k, v| -%>