diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp
index bce58a62..4f628483 100644
--- a/manifests/storage/rbd/pools.pp
+++ b/manifests/storage/rbd/pools.pp
@@ -15,15 +15,15 @@
 #
 class cloud::storage::rbd::pools(
   $setup_pools          = false,
-  $glance_pool          = 'ceph_glance',
-  $glance_user          = 'glance',
-  $cinder_pool          = 'ceph_cinder',
+  $glance_user          = $os_params::glance_rbd_user,
+  $glance_pool          = $os_params::glance_rbd_pool,
+  $cinder_user          = $os_params::cinder_rbd_user,
+  $cinder_pool          = $os_params::cinder_rbd_pool,
   $pool_default_pg_num  = $::ceph::conf::pool_default_pg_num,
   $pool_default_pgp_num = $::ceph::conf::pool_default_pgp_num,
-  $cinder_user          = 'cinder',
-  $cinder_backup_user   = 'cinder',
-  $cinder_backup_pool   = 'ceph_backup_cinder',
-  $ceph_fsid            = $::os_params::ceph_fsid,
+  $cinder_backup_user   = $os_params::cinder_rbd_backup_user,
+  $cinder_backup_pool   = $os_params::cinder_rbd_backup_pool,
+  $ceph_fsid            = $os_params::ceph_fsid,
 ) {
 
   if $setup_pools {
diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp
index 3e467a5e..cf5e0871 100644
--- a/manifests/volume/controller.pp
+++ b/manifests/volume/controller.pp
@@ -23,8 +23,8 @@ class cloud::volume::controller(
   $ks_glance_internal_host   = $os_params::ks_glance_internal_host,
   $api_eth                   = $os_params::api_eth,
   # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
-  #$backup_ceph_pool          = 'ceph_backup_cinder',
-  #$backup_ceph_user          = 'cinder'
+  #$backup_ceph_pool          = $os_params::cinder_rbd_backup_pool,
+  #$backup_ceph_user          = $os_params::cinder_rbd_backup_user
 ) {
 
   include 'cloud::volume'
diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp
index 9ecf6c46..f08ad7c0 100644
--- a/manifests/volume/storage.pp
+++ b/manifests/volume/storage.pp
@@ -18,8 +18,8 @@
 
 class cloud::volume::storage(
   $glance_api_version     = $os_params::glance_api_version,
-  $cinder_rbd_pool        = 'ceph_cinder',
-  $cinder_rbd_user        = 'cinder',
+  $cinder_rbd_pool        = $os_params::cinder_rbd_pool,
+  $cinder_rbd_user        = $os_params::cinder_rbd_user,
   $cinder_rbd_secret_uuid = $os_params::cinder_rbd_secret_uuid,
 ) {