diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index 6913ef63..40b40175 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -136,13 +136,13 @@ Host *
     Exec <<| tag == 'get_or_set_virsh_secret' |>>
     Exec <<| tag == 'set_secret_value_virsh' |>>
 
-    Ceph::Key <<| title == $nova_user |>>
-    if defined(Ceph::Key[$nova_user]) {
+    Ceph::Key <<| title == $nova_rbd_user |>>
+    if defined(Ceph::Key[$nova_rbd_user]) {
       file { '/etc/ceph/ceph.client.nova.keyring':
         owner   => 'nova',
         group   => 'nova',
         mode    => '0400',
-        require => Ceph::Key[$nova_user]
+        require => Ceph::Key[$nova_rbd_user]
       }
     }
     Concat::Fragment <<| title == 'ceph-client-os' |>>
diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp
index 6aed520c..eb3a240e 100644
--- a/manifests/volume/storage.pp
+++ b/manifests/volume/storage.pp
@@ -73,13 +73,13 @@ class cloud::volume::storage(
     rbd_max_clone_depth              => $cinder_rbd_max_clone_depth,
   }
 
-  Ceph::Key <<| title == $cinder_user |>>
-  if defined(Ceph::Key[$cinder_user]) {
+  Ceph::Key <<| title == $cinder_rbd_user |>>
+  if defined(Ceph::Key[$cinder_rbd_user]) {
     file { '/etc/ceph/ceph.client.cinder.keyring':
       owner   => 'cinder',
       group   => 'cinder',
       mode    => '0400',
-      require => Ceph::Key[$cinder_user]
+      require => Ceph::Key[$cinder_rbd_user]
     }
   }
   Concat::Fragment <<| title == 'ceph-client-os' |>>