diff --git a/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml
index ff9226cf..92e6a326 100644
--- a/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml
+++ b/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml
@@ -1,31 +1,12 @@
 swh::deploy::storage::backend::listen::host: 0.0.0.0
 swh::deploy::storage::backend::workers: 48
 swh::deploy::storage::backend::max_requests: 1000
 swh::deploy::storage::backend::max_requests_jitter: 100
 
-swh::deploy::objstorage::backend::listen::host: 0.0.0.0
-swh::deploy::objstorage::backend::workers: 8
-
-swh::deploy::storage::db::host: db.internal.softwareheritage.org
-swh::deploy::storage::db::port: 5432
-
-swh::deploy::indexer::storage::backend::listen::host: 0.0.0.0
-swh::deploy::indexer::storage::db::host: dbreplica1.euwest.azure.internal.softwareheritage.org
-swh::deploy::indexer::storage::db::port: 5432
-
-swh::deploy::objstorage::config:
-  objstorage: "%{alias('swh::remote_service::objstorage::config::azure_readonly_with_fallback')}"
-
 swh::deploy::storage::config::local:
   cls: local
   args:
     db: "host=%{hiera('swh::deploy::storage::db::host')} port=%{hiera('swh::deploy::storage::db::port')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
     objstorage: "%{alias('swh::remote_service::objstorage::config::azure_readonly_with_fallback')}"
 
 swh::deploy::worker::instances: []
-
-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')}"
-
diff --git a/site-modules/role/manifests/swh_storage_cloud.pp b/site-modules/role/manifests/swh_storage_cloud.pp
index 14693f0f..578ef2a8 100644
--- a/site-modules/role/manifests/swh_storage_cloud.pp
+++ b/site-modules/role/manifests/swh_storage_cloud.pp
@@ -1,3 +1,4 @@
-class role::swh_storage_cloud inherits role::swh_base_storage {
+class role::swh_storage_cloud inherits role::swh_base {
+  include profile::swh::deploy::storage
   include ::profile::swh::deploy::objstorage_cloud
 }