diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1585,9 +1585,10 @@
 swh::deploy::journal::conf_directory: "%{hiera('swh::conf_directory')}/journal"
 
 swh::deploy::journal::brokers:
-  - esnode1.internal.softwareheritage.org
-  - esnode2.internal.softwareheritage.org
-  - esnode3.internal.softwareheritage.org
+  - kafka1.internal.softwareheritage.org
+  - kafka2.internal.softwareheritage.org
+  - kafka3.internal.softwareheritage.org
+  - kafka4.internal.softwareheritage.org
 
 swh::deploy::journal::prefix: swh.journal.objects
 
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
@@ -44,6 +44,7 @@
           brokers: "%{alias('swh::deploy::journal::brokers')}"
           prefix: "%{alias('swh::deploy::journal::prefix')}"
           client_id: "swh.storage.journal_writer.%{::swh_hostname.short}"
+          anonymize: true
           producer_config:
             message.max.bytes: 1000000000