diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1911,7 +1911,8 @@
   storage:
     cls: postgresql
     db: "%{alias('swh::deploy::storage::db::config::read-only')}"
-    objstorage: "%{alias('swh::remote_service::objstorage::config')}"
+    objstorage:
+      cls: noop
 
 swh::deploy::journal_simple_checker_producer::conf_file: "%{hiera('swh::deploy::journal::conf_directory')}/checker.yml"
 swh::deploy::journal_simple_checker_producer::user: swhstorage
diff --git a/data/hostname/scrubber1.internal.softwareheritage.org.yaml b/data/hostname/scrubber1.internal.softwareheritage.org.yaml
deleted file mode 100644
--- a/data/hostname/scrubber1.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-swh::remote_service::objstorage::config:
-  cls: noop