diff --git a/data/hostname/storage0.internal.staging.swh.network.yaml b/data/hostname/storage0.internal.staging.swh.network.yaml
--- a/data/hostname/storage0.internal.staging.swh.network.yaml
+++ b/data/hostname/storage0.internal.staging.swh.network.yaml
@@ -34,15 +34,17 @@
 
 swh::deploy::storage::config:
   storage:
-    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')}"
-  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}"
-      producer_config:
-        message.max.bytes: 1000000000
+    cls: pipeline
+    steps:
+      - cls: validate
+      - cls: local
+        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')}"
+        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}"
+            producer_config:
+              message.max.bytes: 1000000000
diff --git a/data/hostname/uffizi.softwareheritage.org.yaml b/data/hostname/uffizi.softwareheritage.org.yaml
--- a/data/hostname/uffizi.softwareheritage.org.yaml
+++ b/data/hostname/uffizi.softwareheritage.org.yaml
@@ -15,37 +15,40 @@
 
 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
+    cls: pipeline
+    steps:
+      - cls: validate
+      - cls: local
         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
+          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::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}"
-          producer_config:
-            message.max.bytes: 1000000000
+                    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}"
+              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