diff --git a/data/hostname/scheduler0.internal.staging.swh.network.yaml b/data/hostname/scheduler0.internal.staging.swh.network.yaml
index d872af7f..64ea92f1 100644
--- a/data/hostname/scheduler0.internal.staging.swh.network.yaml
+++ b/data/hostname/scheduler0.internal.staging.swh.network.yaml
@@ -1,23 +1,18 @@
 networks:
   default:
     interface: eth0
     address: 192.168.128.4
     netmask: 255.255.255.0
     gateway: 192.168.128.1
 
 dar::backup::exclude:
   - var/lib/rabbitmq
 
 swh::postgres::service::users:
   - swhscheduler
 
 rabbitmq::enable::guest: true
 
 swh::deploy::scheduler::remote::backend::listen::host: 0.0.0.0
 swh::deploy::scheduler::task_broker: "amqp://guest:guest@127.0.0.1:5672//"
-swh::deploy::scheduler::config::local: &swh_scheduler_local_config
-  scheduler:
-    cls: local
-    args:
-      db: service=admin-staging-swh-scheduler
 
diff --git a/data/hostname/storage0.internal.staging.swh.network.yaml b/data/hostname/storage0.internal.staging.swh.network.yaml
index ecdeac80..75b4ce98 100644
--- a/data/hostname/storage0.internal.staging.swh.network.yaml
+++ b/data/hostname/storage0.internal.staging.swh.network.yaml
@@ -1,42 +1,33 @@
 networks:
   default:
     interface: eth0
     address: 192.168.128.2
     netmask: 255.255.255.0
     gateway: 192.168.128.1
 
 swh::postgres::service::users:
   - swhstorage
 
 # open objstorage api
 swh::deploy::objstorage::backend::listen::host: 0.0.0.0
 swh::deploy::objstorage::backend::workers: 4
 swh::deploy::objstorage::directory: "%{hiera('swh::deploy::storage::directory')}"
 swh::deploy::objstorage::slicing: 0:1/1:5
 
+swh::remote_service::objstorage::config:
+  cls: pathslicing
+  args:
+    root: "%{hiera('swh::deploy::storage::directory')}"
+    slicing: "%{hiera('swh::deploy::objstorage::slicing')}"
+
 # Deploy the storage server as a public resource
 swh::deploy::storage::backend::listen::host: 0.0.0.0
 swh::deploy::storage::backend::workers: 4
 swh::deploy::storage::backend::max_requests: 100
 swh::deploy::storage::backend::max_requests_jitter: 10
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: service=admin-staging-swh
-      objstorage:
-        cls: pathslicing
-        args:
-          root: "%{hiera('swh::deploy::storage::directory')}"
-          slicing: "%{hiera('swh::deploy::objstorage::slicing')}"
 
 # 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: 4
-swh::deploy::indexer::storage::config:
-  indexer_storage:
-    cls: local
-    args:
-      db: service=admin-staging-swh-indexer
 
 nginx::worker_processes: 4