diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -722,15 +722,19 @@
       - auth.softwareheritage.org
   kafka1.internal.softwareheritage.org:
     domains:
+      - broker1.journal.softwareheritage.org
       - kafka1.internal.softwareheritage.org
   kafka2.internal.softwareheritage.org:
     domains:
+      - broker2.journal.softwareheritage.org
       - kafka2.internal.softwareheritage.org
   kafka3.internal.softwareheritage.org:
     domains:
+      - broker3.journal.softwareheritage.org
       - kafka3.internal.softwareheritage.org
   kafka4.internal.softwareheritage.org:
     domains:
+      - broker4.journal.softwareheritage.org
       - kafka4.internal.softwareheritage.org
   kafka01.euwest.azure.internal.softwareheritage.org:
     domains:
@@ -2363,12 +2367,16 @@
     brokers:
       kafka1.internal.softwareheritage.org:
         id: 1
+        public_hostname: broker1.journal.softwareheritage.org
       kafka2.internal.softwareheritage.org:
         id: 2
+        public_hostname: broker2.journal.softwareheritage.org
       kafka3.internal.softwareheritage.org:
         id: 3
+        public_hostname: broker3.journal.softwareheritage.org
       kafka4.internal.softwareheritage.org:
         id: 4
+        public_hostname: broker4.journal.softwareheritage.org
     broker::heap_opts: "-Xmx6G -Xms6G"
     tls: true
     plaintext_port: 9092
diff --git a/site-modules/profile/manifests/kafka/broker.pp b/site-modules/profile/manifests/kafka/broker.pp
--- a/site-modules/profile/manifests/kafka/broker.pp
+++ b/site-modules/profile/manifests/kafka/broker.pp
@@ -26,6 +26,9 @@
   $broker_config = $kafka_cluster_config['brokers'][$::swh_hostname['internal_fqdn']]
   $broker_id = $broker_config['id']
 
+  $internal_hostname = $swh_hostname['internal_fqdn']
+  $public_hostname = pick($broker_config['public_hostname'], $internal_hostname.regsubst('\.internal', ''))
+
   $kafka_config = $base_kafka_config + {
     'zookeeper.connect' => $zookeeper_connect_string,
     'broker.id'         => $broker_id,
@@ -64,9 +67,6 @@
       trustcacerts => true,
     }
 
-    $internal_hostname = $swh_hostname['internal_fqdn']
-    $public_hostname = $internal_hostname.regsubst('\.internal', '')
-
     $plaintext_port = $kafka_cluster_config['plaintext_port']
     $internal_tls_port = $kafka_cluster_config['internal_tls_port']
     $public_tls_port = $kafka_cluster_config['public_tls_port']
@@ -108,7 +108,7 @@
 
   } else {
     $kafka_tls_config = {
-      'listeners' => "PLAINTEXT://${swh_hostname['internal_fqdn']}:${kafka_cluster_config['plaintext_port']}",
+      'listeners' => "PLAINTEXT://${internal_hostname}:${kafka_cluster_config['plaintext_port']}",
     }
 
     $jaas_cli_opts = []