diff --git a/data/hostname/prado.softwareheritage.org.yaml b/data/hostname/prado.softwareheritage.org.yaml
deleted file mode 100644
index 529933de..00000000
--- a/data/hostname/prado.softwareheritage.org.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-dar::backup::exclude:
-  - srv/softwareheritage/postgres
-  - srv/softwareheritage/postgres-hdd
-
-icinga2::host::vars:
-  load: high
-
-prometheus::sql::config_snippets:
-  - swh-scheduler
-  - swh-storage
-
-pgbouncer::auth_hba_file: /etc/postgresql/10/secondary/pg_hba.conf
-pgbouncer::listen_addr: 192.168.100.100
-pgbouncer::databases:
-  # swh
-  - source_db: "%{hiera('swh::deploy::storage::db::dbname')}"
-    host: prado.internal.softwareheritage.org
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-
diff --git a/manifests/site.pp b/manifests/site.pp
index 5eb1b555..b1ebfe56 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,119 +1,114 @@
 node 'louvre.softwareheritage.org' {
   include role::swh_hypervisor_master
 }
 
 node /^(orsay|beaubourg|hypervisor\d+)\.(internal\.)?softwareheritage\.org$/
 {
   include role::swh_hypervisor
 }
 
 node 'pergamon.softwareheritage.org' {
   include role::swh_sysadmin
 }
 
 node 'tate.softwareheritage.org' {
   include role::swh_forge
 }
 
 node 'moma.softwareheritage.org' {
   include role::swh_api
 }
 
 node 'webapp0.softwareheritage.org' {
   include role::swh_api_azure
 }
 
 node 'saatchi.internal.softwareheritage.org' {
   include role::swh_scheduler
 }
 
-node /^(prado|somerset).(internal.)?softwareheritage.org$/ {
-  include role::swh_database
-  include profile::pgbouncer
-}
-
-node 'belvedere.internal.softwareheritage.org' {
+node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ {
   include role::swh_database
   include profile::pgbouncer
 }
 
 node 'banco.softwareheritage.org' {
   include role::swh_backup
 }
 
 node /^esnode\d+.(internal.)?softwareheritage.org$/ {
   include role::swh_elasticsearch
 }
 
 node /^(unibo-test).(internal.)?softwareheritage.org$/ {
   include role::swh_vault_test
 }
 
 node /^(unibo-prod|vangogh).(euwest.azure.)?(internal.)?softwareheritage.org$/ {
   include role::swh_vault
 }
 
 node /^(uffizi|storage\d+\.[^.]+\.azure).(internal.)?softwareheritage.org$/ {
   include role::swh_storage
 }
 
 node /^getty.(internal.)?softwareheritage.org$/ {
   include role::swh_eventlog
 }
 
 node /^worker\d+\.(internal\.)?softwareheritage\.org$/ {
   include role::swh_worker_inria
 }
 
 node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_worker_azure
 }
 
 node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_database
 }
 
 node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_osd
 }
 
 node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_mon
 }
 
 node /^ns\d+\.(.*\.azure\.)?internal\.softwareheritage\.org/ {
   include role::swh_nameserver_secondary
 }
 
 node 'thyssen.internal.softwareheritage.org' {
   include role::swh_ci_server
 }
 
 node /^jenkins-debian\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ci_agent_debian
 }
 
 node 'logstash0.internal.softwareheritage.org' {
   include role::swh_logstash_instance
 }
 
 node 'kibana0.internal.softwareheritage.org' {
   include role::swh_kibana_instance
 }
 
 node 'munin0.internal.softwareheritage.org' {
   include role::swh_munin_master
 }
 
 node
   'giverny.softwareheritage.org',
   'petit-palais.softwareheritage.org',
   'grand-palais.softwareheritage.org',
   'ddouard-desktop.internal.softwareheritage.org' {
   include role::swh_desktop
 }
 
 node default {
   include role::swh_base
   include profile::puppet::agent
 }