diff --git a/data/hostname/moma.softwareheritage.org.yaml b/data/hostname/moma.softwareheritage.org.yaml
index 7df98477..8ab772d2 100644
--- a/data/hostname/moma.softwareheritage.org.yaml
+++ b/data/hostname/moma.softwareheritage.org.yaml
@@ -1,44 +1,44 @@
 networks:
   eth0:
     address: 128.93.193.31
     netmask: 255.255.255.0
     ups:
       - ip rule add from 128.93.193.31 table vlan220
       - ip route add 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220
       - ip route add default via 128.93.193.254 dev $IFACE table vlan220
       - ip route flush cache
     downs:
       - ip route del default via 128.93.193.254 dev $IFACE table vlan220
       - ip route del 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220
       - ip rule del from 128.93.193.31 table vlan220
       - ip route flush cache
   eth1:
     type: private
     address: 192.168.100.31
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   eth2:
     address: 128.93.166.15
     netmask: 26
     gateway: 128.93.166.62
 
 backups::exclude:
   - var/lib/rabbitmq
 
-swh::deploy::storage::db::host: db.internal.softwareheritage.org
+swh::deploy::storage::db::host: somerset.internal.softwareheritage.org
 swh::deploy::storage::backend::workers: 16
 
 hitch::frontend: "[*]:443"
 hitch::proxy_support: true
 
 varnish::http_port: 80
 apache::http_port: 9080
 
 # Disabled as it seems to be flaky
 #hitch::http2_support: true
 #varnish::http2_support: true
 
 # Disable default vhost on port 80
 apache::default_vhost: false
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::localhost')}"
diff --git a/data/hostname/webapp1.internal.softwareheritage.org.yaml b/data/hostname/webapp1.internal.softwareheritage.org.yaml
index 6cd9ac53..4ebcc7bc 100644
--- a/data/hostname/webapp1.internal.softwareheritage.org.yaml
+++ b/data/hostname/webapp1.internal.softwareheritage.org.yaml
@@ -1,20 +1,20 @@
 hitch::frontend: "[*]:443"
 hitch::proxy_support: true
 
 varnish::http_port: 80
 apache::http_port: 9080
 
 # Disable default vhost on port 80
 apache::default_vhost: false
 
 swh::deploy::webapp::vhost::letsencrypt_cert: archive_webapp1
 
-swh::deploy::storage::db::host: db.internal.softwareheritage.org
+swh::deploy::storage::db::host: somerset.internal.softwareheritage.org
 swh::deploy::storage::backend::workers: 16
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::localhost')}"
 
 swh::deploy::reverse_proxy::services:
   - webapp
 
 swh::deploy::webapp::metadata_search_backend: swh-search