diff --git a/data/deployments/production/azure_euwest.yaml b/data/deployments/production/azure_euwest.yaml
index 52d0e291..2b43f3cf 100644
--- a/data/deployments/production/azure_euwest.yaml
+++ b/data/deployments/production/azure_euwest.yaml
@@ -1,35 +1,42 @@
 ---
 swh::deploy::worker::instances:
   - indexer_content_mimetype
   - indexer_fossology_license
   - indexer_origin_intrinsic_metadata
   - indexer_origin_extrinsic_metadata
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::azure')}"
 swh::remote_service::indexer::config: "%{alias('swh::remote_service::indexer::config::azure')}"
 
 swh::remote_service::objstorage::config::azure_readonly_with_fallback: &swh_azure_readonly_with_fallback
   cls: multiplexer
   objstorages:
     - "%{alias('swh::remote_service::objstorage::config::azure::readonly')}"
     - "%{alias('swh::remote_service::objstorage::config::banco::readonly')}"
     - "%{alias('swh::remote_service::objstorage::config::saam::readonly')}"
 
 # Activate graph options to production cookers
 swh::deploy::worker::vault_cooker::config:
   storage:
     cls: retry
     storage: "%{alias('swh::remote_service::storage::config')}"
   vault: "%{alias('swh::remote_service::vault::config::writable')}"
   graph: "%{alias('swh::remote_service::graph::config')}"
   celery:
     task_broker: "%{alias('swh::deploy::worker::task_broker')}"
     task_modules:
       - swh.vault.cooking_tasks
     task_queues:
       - swh.vault.cooking_tasks.SWHCookingTask
       - swh.vault.cooking_tasks.SWHBatchCookingTask
   max_bundle_size: 1073741824  # 1GiB
 
 tmpfs::size: 4096m
 tmpfs::nr_inodes: 200m
+
+# In production, we pass through the public brokers
+swh::deploy::journal_client::brokers:
+  - broker1.journal.softwareheritage.org:9093
+  - broker2.journal.softwareheritage.org:9093
+  - broker3.journal.softwareheritage.org:9093
+  - broker4.journal.softwareheritage.org:9093
diff --git a/data/deployments/production/common.yaml b/data/deployments/production/common.yaml
index c3b65387..87f1692b 100644
--- a/data/deployments/production/common.yaml
+++ b/data/deployments/production/common.yaml
@@ -1,35 +1,28 @@
 swh::deploy::deposit::reverse_proxy::backend_http_host: "::1"
 swh::deploy::webapp::reverse_proxy::backend_http_host: "::1"
 
 elasticsearch::config::cluster::name: swh-logging-prod
 elasticsearch::config::discovery::seed_hosts:
   - esnode1.internal.softwareheritage.org
   - esnode2.internal.softwareheritage.org
   - esnode3.internal.softwareheritage.org
 elasticsearch::config::cluster::initial_master_nodes:
   - esnode1
   - esnode2
   - esnode3
 
 elasticsearch::jvm_options::heap_size: 16g
 
 swh::postgresql::shared_buffers: 4GB
 
 swh::deploy::webapp::url: "https://archive.softwareheritage.org"
 swh::deploy::webapp::inbound_email::domain: "%{lookup('swh::deploy::webapp::inbound_email::production::domain')}"
 
 # e2e checks on vault
 swh::deploy::vault::e2e::storage: "http://saam.internal.softwareheritage.org:%{hiera('swh::remote_service::storage::port')}"
 
 swh::deploy::worker::loader_git::concurrency: 4
 
 memcached::server::max_memory: 1224
 
 cassandra::default_cluster_name: archive_production
-
-# In production, we pass through the public brokers
-swh::deploy::journal_client::brokers:
-  - broker1.journal.softwareheritage.org:9093
-  - broker2.journal.softwareheritage.org:9093
-  - broker3.journal.softwareheritage.org:9093
-  - broker4.journal.softwareheritage.org:9093