diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1681,10 +1681,13 @@
   - 127.0.0.1
   - localhost
   - "::1"
+
 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')}"
+    journal_writer: "%{alias('swh::deploy::indexer::journal::writer::config')}"
+
 
 swh::deploy::indexer::journal::prefix: 'swh.journal.indexed'
 swh::deploy::indexer::brokers: "%{alias('swh::deploy::journal::brokers')}"
diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -254,12 +254,6 @@
 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
-    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')}"
-    journal_writer: "%{alias('swh::deploy::indexer::journal::writer::config')}"
-
 nginx::worker_processes: 4
 
 ## Reverse-proxy and frontend
diff --git a/data/hostname/saam.internal.softwareheritage.org.yaml b/data/hostname/saam.internal.softwareheritage.org.yaml
--- a/data/hostname/saam.internal.softwareheritage.org.yaml
+++ b/data/hostname/saam.internal.softwareheritage.org.yaml
@@ -43,10 +43,6 @@
 # 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
diff --git a/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml
--- a/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml
+++ b/data/hostname/storage01.euwest.azure.internal.softwareheritage.org.yaml
@@ -25,3 +25,9 @@
 swh::deploy::worker::instances: []
 
 swh::deploy::search::backend::listen::host: 0.0.0.0
+
+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')}"
+