diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp
index 2d420d6c..13f955bb 100644
--- a/manifests/volume/storage.pp
+++ b/manifests/volume/storage.pp
@@ -17,9 +17,9 @@
 #
 
 class privatecloud::volume::storage(
-  $cinder_rbd_pool        = $os_params::cinder_rbd_pool,
   $glance_api_version     = $os_params::glance_api_version,
-  $cinder_rbd_user        = $os_params::cinder_rbd_user,
+  $cinder_rbd_pool        = 'ceph_cinder',
+  $cinder_rbd_user        = 'cinder',
   $cinder_rbd_secret_uuid = $os_params::cinder_rbd_secret_uuid,
 ) {
 
diff --git a/spec/classes/privatecloud_volume_storage_spec.rb b/spec/classes/privatecloud_volume_storage_spec.rb
index f1a9a081..29ea60a4 100644
--- a/spec/classes/privatecloud_volume_storage_spec.rb
+++ b/spec/classes/privatecloud_volume_storage_spec.rb
@@ -36,8 +36,8 @@ describe 'privatecloud::volume::storage' do
     end
 
     let :params do
-      { :cinder_rbd_pool         => 'cinder',
-        :cinder_rbd_user         => 'ceph-cinder',
+      { :cinder_rbd_pool         => 'ceph_cinder',
+        :cinder_rbd_user         => 'cinder',
         :cinder_rbd_secret_uuid  => 'secrete',
         :glance_api_version      => '2' }
     end
@@ -60,9 +60,9 @@ describe 'privatecloud::volume::storage' do
 
     it 'configure cinder volume with rbd backend' do
       should contain_class('cinder::volume::rbd').with(
-          :rbd_pool           => 'cinder',
+          :rbd_pool           => 'ceph_cinder',
           :glance_api_version => '2',
-          :rbd_user           => 'ceph-cinder',
+          :rbd_user           => 'cinder',
           :rbd_secret_uuid    => 'secrete'
         )
     end