diff --git a/data/common/common.yaml b/data/common/common.yaml
index 4e46274f4906e9f378dcbaa8570f986e29be927d..da9ccea11e86acaba551d1e50eec2aa21975bc6d 100644
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -2339,7 +2339,7 @@ swh::remote_service::search::config::local_internal_network:
 
 swh::remote_service::search::config::search1:
   cls: remote
-  url: "http://search1.internal.softwareheritage.org:%{hiera('swh::remote_service::search::port')}/"
+  url: "http://search.internal.softwareheritage.org"
 
 swh::remote_service::search::config: "%{alias('swh::remote_service::search::config::local_internal_network')}"
 
diff --git a/manifests/site.pp b/manifests/site.pp
index d69946f2d77c8d772d4d67a91d0b5a7430e1e743..a051bb6506721a84cc28c39d0a7cb2b233acb708 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -28,10 +28,6 @@ node /^search-esnode\d\.internal\.softwareheritage\.org$/ {
   include role::swh_elasticsearch
 }
 
-node /^search\d\.internal\.softwareheritage\.org$/ {
-  include role::swh_search_with_journal_client
-}
-
 node /^counters\d\.internal\.softwareheritage\.org$/ {
   include role::swh_counters_with_journal_client
 }