diff --git a/metadata/service/radosgw/cluster.yml b/metadata/service/radosgw/cluster.yml
new file mode 100644
index 0000000..69f09f7
--- /dev/null
+++ b/metadata/service/radosgw/cluster.yml
@@ -0,0 +1,16 @@
+applications:
+- ceph
+classes:
+- service.ceph.common.cluster
+- service.ceph.support
+parameters:
+  _param:
+    ceph_radosgw_hostname: ${linux:system:name}
+    ceph_radosgw_bind_port: 8080
+  ceph:
+    radosgw:
+      enabled: true
+      hostname: ${_param:ceph_radosgw_hostname}
+      bind:
+        address: ${_param:single_address}
+        port: ${_param:ceph_radosgw_bind_port}
diff --git a/metadata/service/radosgw/keystonev3.yml b/metadata/service/radosgw/keystonev3.yml
deleted file mode 100644
index 8308746..0000000
--- a/metadata/service/radosgw/keystonev3.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-classes:
-- service.ceph.radosgw.single
-parameters:
-  _param:
-    ceph_radosgw_keystone_host: 127.0.0.1
-    ceph_radosgw_keystone_user: admin
-  ceph:
-    radosgw:
-      identity:
-        engine: keystone
-        api_version: 3
-        host: ${_param:ceph_radosgw_keystone_host}
-        port: 5000
-        user: admin
-        password: ${_param:ceph_radosgw_keystone_password}
-        project: admin
-        domain: default
diff --git a/metadata/service/radosgw/single.yml b/metadata/service/radosgw/single.yml
index d4b532e..fe65d2d 100644
--- a/metadata/service/radosgw/single.yml
+++ b/metadata/service/radosgw/single.yml
@@ -1,14 +1,16 @@
 applications:
 - ceph
 classes:
-- service.ceph.common.cluster
+- service.ceph.common.single
 - service.ceph.support
 parameters:
   _param:
-    ceph_radosgw_hostname: radosgw
+    ceph_radosgw_hostname: ${linux:system:name}
+    ceph_radosgw_bind_port: 8080
   ceph:
     radosgw:
       enabled: true
       hostname: ${_param:ceph_radosgw_hostname}
       bind:
         address: ${_param:single_address}
+        port: ${_param:ceph_radosgw_bind_port}