diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1548,15 +1548,15 @@
 
 swh::remote_service::search::config::empty: {}
 
-swh::remote_service::search::config::localhost:
+swh::remote_service::search::config::local_internal_network:
   cls: remote
-  url: "http://localhost:%{hiera('swh::remote_service::search::port')}/"
+  url: "http://%{lookup('swh::deploy::search::backend::listen::host')}:%{hiera('swh::remote_service::search::port')}/"
 
 swh::remote_service::search::config::search1:
   cls: remote
   url: "http://search1.internal.softwareheritage.org:%{hiera('swh::remote_service::search::port')}/"
 
-swh::remote_service::search::config: "%{alias('swh::remote_service::search::config::localhost')}"
+swh::remote_service::search::config: "%{alias('swh::remote_service::search::config::local_internal_network')}"
 
 # Indexer backend configurations
 swh::remote_service::indexer::config::saam:
@@ -3519,7 +3519,7 @@
     object_types:
       - origin_intrinsic_metadata
 
-swh::deploy::search::backend::listen::host: 127.0.0.1
+swh::deploy::search::backend::listen::host: "%{::fqdn}"
 swh::deploy::search::backend::listen::port: "%{alias('swh::remote_service::search::port')}"
 swh::deploy::search::backend::workers: 4
 swh::deploy::search::backend::reload_mercy: 3600
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
@@ -313,7 +313,6 @@
 swh::deploy::webapp::metadata_search_backend: swh-search
 
 swh::deploy::search::index: origin-v0.9.0
-swh::deploy::search::backend::listen::host: 0.0.0.0
 swh::deploy::search::journal_client::service_types:
   - objects
   - indexed
diff --git a/data/hostname/moma.softwareheritage.org.yaml b/data/hostname/moma.softwareheritage.org.yaml
--- a/data/hostname/moma.softwareheritage.org.yaml
+++ b/data/hostname/moma.softwareheritage.org.yaml
@@ -12,6 +12,7 @@
 backups::exclude:
   - var/lib/rabbitmq
 
+swh::deploy::search::backend::listen::host: moma.internal.softwareheritage.org
 swh::deploy::storage::backend::listen::host: moma.internal.softwareheritage.org
 swh::deploy::storage::db::host: somerset.internal.softwareheritage.org
 swh::deploy::storage::backend::workers: 16
diff --git a/data/hostname/search1.internal.softwareheritage.org.yaml b/data/hostname/search1.internal.softwareheritage.org.yaml
deleted file mode 100644
--- a/data/hostname/search1.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1 +0,0 @@
-swh::deploy::search::backend::listen::host: 0.0.0.0