diff --git a/charts-wip/radosgw/.helmignore b/charts/radosgw/.helmignore
similarity index 100%
rename from charts-wip/radosgw/.helmignore
rename to charts/radosgw/.helmignore
diff --git a/charts-wip/radosgw/Chart.yaml b/charts/radosgw/Chart.yaml
similarity index 100%
rename from charts-wip/radosgw/Chart.yaml
rename to charts/radosgw/Chart.yaml
diff --git a/charts-wip/radosgw/templates/NOTES.txt b/charts/radosgw/templates/NOTES.txt
similarity index 100%
rename from charts-wip/radosgw/templates/NOTES.txt
rename to charts/radosgw/templates/NOTES.txt
diff --git a/charts-wip/radosgw/templates/_helpers.tpl b/charts/radosgw/templates/_helpers.tpl
similarity index 100%
rename from charts-wip/radosgw/templates/_helpers.tpl
rename to charts/radosgw/templates/_helpers.tpl
diff --git a/charts-wip/radosgw/templates/config.yaml b/charts/radosgw/templates/config.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/config.yaml
rename to charts/radosgw/templates/config.yaml
diff --git a/charts-wip/radosgw/templates/ingress.yaml b/charts/radosgw/templates/ingress.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/ingress.yaml
rename to charts/radosgw/templates/ingress.yaml
diff --git a/charts-wip/radosgw/templates/keyring.yaml b/charts/radosgw/templates/keyring.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/keyring.yaml
rename to charts/radosgw/templates/keyring.yaml
diff --git a/charts-wip/radosgw/templates/service.yaml b/charts/radosgw/templates/service.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/service.yaml
rename to charts/radosgw/templates/service.yaml
diff --git a/charts-wip/radosgw/templates/statefulset.yaml b/charts/radosgw/templates/statefulset.yaml
similarity index 97%
rename from charts-wip/radosgw/templates/statefulset.yaml
rename to charts/radosgw/templates/statefulset.yaml
index 274be68..4ab9a6e 100644
--- a/charts-wip/radosgw/templates/statefulset.yaml
+++ b/charts/radosgw/templates/statefulset.yaml
@@ -54,7 +54,7 @@ spec:
               name: ceph-keyring
               subPath: client.admin.keyring
               readOnly: true
-            - mountPath: /var/lib/ceph/bootstrap-rgw.keyring
+            - mountPath: /var/lib/ceph/bootstrap-rgw/ceph.keyring
               name: ceph-keyring
               subPath: bootstrap-rgw.keyring
               readOnly: true
diff --git a/charts-wip/radosgw/templates/tests/test-connection.yaml b/charts/radosgw/templates/tests/test-connection.yaml
similarity index 100%
rename from charts-wip/radosgw/templates/tests/test-connection.yaml
rename to charts/radosgw/templates/tests/test-connection.yaml
diff --git a/charts-wip/radosgw/values.yaml b/charts/radosgw/values.yaml
similarity index 100%
rename from charts-wip/radosgw/values.yaml
rename to charts/radosgw/values.yaml