diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1541,10 +1541,10 @@
   args:
     url: "http://storage01.euwest.azure.internal.softwareheritage.org:%{hiera('swh::remote_service::storage::port')}/"
 
-swh::remote_service::storage::config::localhost:
+swh::remote_service::storage::config::local_internal_network:
   cls: remote
   args:
-    url: "http://localhost:%{hiera('swh::remote_service::storage::port')}/"
+    url: "http://%{lookup('swh::deploy::storage::backend::listen::host')}:%{lookup('swh::remote_service::storage::port')}/"
 
 swh::remote_service::search::config::empty: {}
 
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::storage::backend::listen::host: moma.internal.softwareheritage.org
 swh::deploy::storage::db::host: somerset.internal.softwareheritage.org
 swh::deploy::storage::backend::workers: 16
 swh::deploy::storage::db::user: guest
@@ -30,4 +31,4 @@
 # Disable default vhost on port 80
 apache::default_vhost: false
 
-swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::localhost')}"
+swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::local_internal_network')}"
diff --git a/data/hostname/webapp1.internal.softwareheritage.org.yaml b/data/hostname/webapp1.internal.softwareheritage.org.yaml
--- a/data/hostname/webapp1.internal.softwareheritage.org.yaml
+++ b/data/hostname/webapp1.internal.softwareheritage.org.yaml
@@ -11,8 +11,9 @@
 
 swh::deploy::storage::db::host: somerset.internal.softwareheritage.org
 swh::deploy::storage::backend::workers: 16
+swh::deploy::storage::backend::listen::host: "%{::fqdn}"
 
-swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::localhost')}"
+swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::local_internal_network')}"
 
 swh::deploy::reverse_proxy::services:
   - webapp