diff --git a/ceph/radosgw/single.yml b/ceph/radosgw/single.yml
index 31bdc7d..d6b9bf7 100644
--- a/ceph/radosgw/single.yml
+++ b/ceph/radosgw/single.yml
@@ -1,3 +1,4 @@
+# LEGACY - use rgw.cluster or rgw.single instead
 parameters:
   _param:
     radosgw_keyring_path: /etc/ceph/ceph.client.radosgw.keyring
diff --git a/ceph/rgw/cluster.yml b/ceph/rgw/cluster.yml
new file mode 100644
index 0000000..fbee1fc
--- /dev/null
+++ b/ceph/rgw/cluster.yml
@@ -0,0 +1,7 @@
+classes:
+- system.haproxy.proxy.single
+- system.haproxy.proxy.listen.radosgw
+- system.linux.system.repo.ceph
+- system.linux.system.repo.ubuntu
+- service.keepalived.cluster.single
+- service.ceph.radosgw.cluster
diff --git a/ceph/rgw/keystone.yml b/ceph/rgw/keystone.yml
new file mode 100644
index 0000000..4340d62
--- /dev/null
+++ b/ceph/rgw/keystone.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    ceph_radosgw_keystone_host: 127.0.0.1
+    ceph_radosgw_keystone_user: admin
+    ceph_radosgw_keystone_api_version: 3
+    ceph_radosgw_keystone_project: admin
+    ceph_radosgw_keystone_domain: default
+    ceph_radosgw_keystone_port: 5000
+  ceph:
+    radosgw:
+      identity:
+        engine: keystone
+        api_version: ${_param:ceph_radosgw_keystone_api_version}
+        host: ${_param:ceph_radosgw_keystone_host}
+        port: ${_param:ceph_radosgw_keystone_port}
+        user: ${_param:ceph_radosgw_keystone_user}
+        password: ${_param:ceph_radosgw_keystone_password}
+        tenant: ${_param:ceph_radosgw_keystone_project}
+        project: ${_param:ceph_radosgw_keystone_project}
+        domain: ${_param:ceph_radosgw_keystone_domain}
diff --git a/ceph/rgw/single.yml b/ceph/rgw/single.yml
new file mode 100644
index 0000000..4dba033
--- /dev/null
+++ b/ceph/rgw/single.yml
@@ -0,0 +1,4 @@
+classes:
+- system.linux.system.repo.ceph
+- system.linux.system.repo.ubuntu
+- service.ceph.radosgw.single