diff --git a/data/hostname/saam.internal.softwareheritage.org.yaml b/data/hostname/saam.internal.softwareheritage.org.yaml
index 1841aa04..6d1f8229 100644
--- a/data/hostname/saam.internal.softwareheritage.org.yaml
+++ b/data/hostname/saam.internal.softwareheritage.org.yaml
@@ -1,157 +1,276 @@
 ---
 backups::exclude:
   - annex
   - data
   - mnt
   - srv/softwareheritage/annex
   - srv/softwareheritage/objects-xfs
 
 # Deploy the storage server as a public resource
 swh::deploy::storage::backend::listen::host: 0.0.0.0
 swh::deploy::storage::backend::workers: 128
 swh::deploy::storage::backend::max_requests: 5000
 swh::deploy::storage::backend::max_requests_jitter: 500
 
 swh::deploy::storage::legacy_directory: /srv/softwareheritage/objects-xfs
 
 swh::deploy::storage::config:
   storage:
     cls: local
     args:
       db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
       objstorage:
         cls: multiplexer
         args:
           objstorages:
             - cls: pathslicing
               args:
                 root: "%{hiera('swh::deploy::storage::directory')}"
                 slicing: "0:2/0:5"
                 compression: none
             - cls: filtered
               args:
                 storage_conf:
                   cls: pathslicing
                   args:
                     root: "%{hiera('swh::deploy::storage::legacy_directory')}"
                     slicing: "0:1/0:2/2:4/4:6"
                     compression: gzip
                 filters_conf:
                   - type: readonly
             - "%{alias('swh::remote_service::objstorage::config::azure')}"
       journal_writer:
         cls: kafka
         args:
           brokers: "%{alias('swh::deploy::journal::brokers')}"
           prefix: "%{alias('swh::deploy::journal::prefix')}"
           client_id: "swh.storage.journal_writer.%{::swh_hostname.short}"
           anonymize: true
           producer_config:
             message.max.bytes: 1000000000
 
 # Deploy the indexer storage server as a public resource
 swh::deploy::indexer::storage::backend::listen::host: 0.0.0.0
 swh::deploy::indexer::storage::backend::workers: 32
 swh::deploy::indexer::storage::config:
   indexer_storage:
     cls: local
     db: "host=%{hiera('swh::deploy::indexer::storage::db::host')} port=%{hiera('swh::deploy::indexer::storage::db::port')} user=%{hiera('swh::deploy::indexer::storage::db::user')} dbname=%{hiera('swh::deploy::indexer::storage::db::dbname')} password=%{hiera('swh::deploy::indexer::storage::db::password')}"
 
 # open objstorage api
 swh::deploy::objstorage::backend::listen::host: 0.0.0.0
 swh::deploy::objstorage::backend::workers: 16
 swh::deploy::objstorage::config:
   objstorage:
     cls: multiplexer
     args:
       objstorages:
         - cls: pathslicing
           args:
             root: "%{hiera('swh::deploy::storage::directory')}"
             slicing: "0:2/0:5"
             compression: none
         - cls: filtered
           args:
             storage_conf:
               cls: pathslicing
               args:
                 root: "%{hiera('swh::deploy::storage::legacy_directory')}"
                 slicing: "0:1/0:2/2:4/4:6"
                 compression: gzip
             filters_conf:
               - type: readonly
   client_max_size: 1073741824  # 1 GiB
 
 icinga2::host::vars:
   load: high
   disks:
     disk /srv/softwareheritage/objects-xfs/0:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/1:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/2:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/3:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/4:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/5:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/6:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/7:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/8:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/9:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/a:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/b:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/c:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/d:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/e:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
     disk /srv/softwareheritage/objects-xfs/f:
       disk_units: 'GB'
       disk_wfree: '100'
       disk_cfree: '50'
 
 nginx::worker_processes: 32
 
 swh::apt_config::enable_non_free: true
 packages:
   - intel-microcode
+
+mountpoints:
+  # override default mountpoints
+  /srv/softwareheritage/objects:
+    # zfs mount: not in fstab
+    ensure: absent
+  /srv/storage/space:
+    # local mount
+    device: /dev/mapper/vg--data-uffizi--space
+    fstype: xfs
+    options:
+      - nofail
+  # local mountpoints
+  /srv/softwareheritage/objects-xfs/0:
+    device: /dev/mapper/vg--data-uffizi--data0
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/1:
+    device: /dev/mapper/vg--data-uffizi--data1
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/2:
+    device: /dev/mapper/vg--data-uffizi--data2
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/3:
+    device: /dev/mapper/vg--data-uffizi--data3
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/4:
+    device: /dev/mapper/vg--data-uffizi--data4
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/5:
+    device: /dev/mapper/vg--data-uffizi--data5
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/6:
+    device: /dev/mapper/vg--data-uffizi--data6
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/7:
+    device: /dev/mapper/vg--data-uffizi--data7
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/8:
+    device: /dev/mapper/vg--data-uffizi--data8
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/9:
+    device: /dev/mapper/vg--data-uffizi--data9
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/a:
+    device: /dev/mapper/vg--data-uffizi--dataa
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/b:
+    device: /dev/mapper/vg--data-uffizi--datab
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/c:
+    device: /dev/mapper/vg--data-uffizi--datac
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/d:
+    device: /dev/mapper/vg--data-uffizi--datad
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/e:
+    device: /dev/mapper/vg--data-uffizi--datae
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/softwareheritage/objects-xfs/f:
+    device: /dev/mapper/vg--data-uffizi--dataf
+    fstype: xfs
+    options:
+      - nofail
+      - ro
+  /srv/storage/content-replayer:
+    device: content-replayer-scratch
+    fstype: tmpfs
+    options:
+      - nodev
+      - nosuid
+      - noexec
+      - size=8G
+      - uid=swhworker
+      - gid=swhdev
diff --git a/site-modules/role/manifests/swh_storage_baremetal.pp b/site-modules/role/manifests/swh_storage_baremetal.pp
index dd6c8395..bbb51c3c 100644
--- a/site-modules/role/manifests/swh_storage_baremetal.pp
+++ b/site-modules/role/manifests/swh_storage_baremetal.pp
@@ -1,5 +1,6 @@
 class role::swh_storage_baremetal inherits role::swh_storage {
   include profile::dar::server
   include profile::megacli
   include profile::multipath
+  include profile::mountpoints
 }