diff --git a/service/cinder-volume.yaml b/service/cinder-volume.yaml
index 3b001ac..1c8d41f 100644
--- a/service/cinder-volume.yaml
+++ b/service/cinder-volume.yaml
@@ -28,5 +28,5 @@ files:
     path: /etc/ceph/ceph.conf
     content: ceph.conf.j2
   cinder-ceph-key:
-    path: /etc/ceph/ceph.client.cinder.keyring
+    path: /etc/ceph/ceph.client.{{ cinder.ceph.username }}.keyring
     content: ceph.client.cinder.keyring.j2
diff --git a/service/files/ceph.client.cinder.keyring.j2 b/service/files/ceph.client.cinder.keyring.j2
index 109da40..71daf6b 100644
--- a/service/files/ceph.client.cinder.keyring.j2
+++ b/service/files/ceph.client.cinder.keyring.j2
@@ -1,3 +1,3 @@
-[client.cinder]
+[client.{{ cinder.ceph.username }}]
 key = {{ cinder.ceph.key }}