diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1375,6 +1375,11 @@
 # End remote service configurations
 #####################################################################################################
 
+swh::deploy::db::pgbouncer::port: 5432
+swh::deploy::db::main::port: 5433
+swh::deploy::db::secondary::port: 5434
+swh::deploy::db::hdd::port: 5435
+
 swh::deploy::directory: "%{hiera('swh::conf_directory')}/deploy"
 swh::deploy::group: swhdeploy
 swh::deploy::public_key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWrJX/uUss/EYZaTp2EIsZgg3ZSH8JcNZV5gBdNZ7EHcQcqxYUCqmwv9Ss3xT8n9kIrH6iz/vquqf84XR+keoZK3bsp50tMOY8LJWpcl/JK2XD6ovoJrHPu+iAroLkE59RdTa1Vz+jF67Q2UuG9f0nKwL4rnkeWTyuK/zAbyHyYKFQntkkwMr5/YTU8sjl/4aNF/2Ww8hitdi2GORlCjav2bB0wyPBA2e8sMt8Hp9O4TIWg/RD6vPX+ZvuFaB/Lw/Hv21622QGTHoZiO92/8/W9/t24il6SU4z96ZGfXqdUZkpPYKBGwyIkZkS4dN6jb4CcRlyXTObphyu3dAlABRt swhworker@worker01'
@@ -1448,8 +1453,8 @@
 swh::deploy::vault::conf_file: "%{hiera('swh::deploy::vault::conf_directory')}/server.yml"
 swh::deploy::vault::user: swhvault
 swh::deploy::vault::group: swhvault
-swh::deploy::vault::db::host: prado
-swh::deploy::vault::db::port: 5434
+swh::deploy::vault::db::host: belvedere
+swh::deploy::vault::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::vault::db::user: swh-vault
 swh::deploy::vault::db::dbname: swh-vault
 swh::deploy::vault::backend::listen::host: 127.0.0.1
@@ -1556,6 +1561,10 @@
 swh::deploy::deposit::user: swhdeposit
 swh::deploy::deposit::group: swhdeposit
 swh::deploy::deposit::media_root_directory: /srv/storage/space/swh-deposit/uploads/
+swh::deploy::deposit::db::host: belvedere
+swh::deploy::deposit::db::port: "%{alias('swh::deploy::db::secondary::port')}"
+swh::deploy::deposit::db::dbname: softwareheritage-deposit
+swh::deploy::deposit::db::dbuser: swhstorage
 # swh::deploy::deposit::runtime_secret_key in private data
 swh::deploy::deposit::config:
   max_upload_size: 209715200
@@ -1568,10 +1577,10 @@
   private:
     secret_key: "%{hiera('swh::deploy::deposit::runtime_secret_key')}"
     db:
-      host: db
-      port: 5432
-      name: softwareheritage-deposit
-      user: swhstorage
+      host: "%{hiera('swh::deploy::deposit::db::host')}"
+      port: "%{hiera('swh::deploy::deposit::db::port')}"
+      name: "%{hiera('swh::deploy::deposit::db::dbname')}"
+      user: "%{hiera('swh::deploy::deposit::db::dbuser')}"
       password: "%{hiera('swh::deploy::storage::db::password')}"
     media_root: "%{hiera('swh::deploy::deposit::media_root_directory')}"
 
@@ -1754,12 +1763,13 @@
   scheduler:
     cls: local
     args:
-      db: "host=%{hiera('swh::deploy::scheduler::db::host')} dbname=%{hiera('swh::deploy::scheduler::db::dbname')} user=%{hiera('swh::deploy::scheduler::db::user')} password=%{hiera('swh::deploy::scheduler::db::password')}"
+      db: "host=%{hiera('swh::deploy::scheduler::db::host')} port=%{hiera('swh::deploy::scheduler::db::port')} dbname=%{hiera('swh::deploy::scheduler::db::dbname')} user=%{hiera('swh::deploy::scheduler::db::user')} password=%{hiera('swh::deploy::scheduler::db::password')}"
 
 swh::deploy::scheduler::conf_file: "%{hiera('swh::conf_directory')}/scheduler.yml"
 swh::deploy::scheduler::user: swhscheduler
 swh::deploy::scheduler::group: swhscheduler
-swh::deploy::scheduler::db::host: db
+swh::deploy::scheduler::db::host: belvedere
+swh::deploy::scheduler::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::scheduler::db::dbname: softwareheritage-scheduler
 swh::deploy::scheduler::db::user: swhscheduler
 # swh::deploy::scheduler::db::password in private data
@@ -1829,12 +1839,12 @@
 swh::deploy::scheduler::updater::backend::conf_file: "%{hiera('swh::deploy::scheduler::updater::backend::conf_dir')}/scheduler-updater.yml"
 swh::deploy::scheduler::updater::backend::user: swhscheduler
 swh::deploy::scheduler::updater::backend::group: swhscheduler
-swh::deploy::scheduler::updater::backend::db::host: db.internal.softwareheritage.org
-swh::deploy::scheduler::updater::backend::db::port: 5432
+swh::deploy::scheduler::updater::backend::db::host: belvedere.internal.softwareheritage.org
+swh::deploy::scheduler::updater::backend::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::scheduler::updater::backend::db::dbname: softwareheritage-scheduler-updater
 swh::deploy::scheduler::updater::backend::db::user: swhscheduler
 swh::deploy::scheduler::updater::backend::config:
-  scheduling_updater_db: "host=%{hiera('swh::deploy::scheduler::updater::backend::db::host')} dbname=%{hiera('swh::deploy::scheduler::updater::backend::db::dbname')} user=%{hiera('swh::deploy::scheduler::updater::backend::db::user')} password=%{hiera('swh::deploy::scheduler::updater::backend::db::password')}"
+  scheduling_updater_db: "host=%{hiera('swh::deploy::scheduler::updater::backend::db::host')} port=%{hiera('swh::deploy::scheduler::updater::backend::db::port')} dbname=%{hiera('swh::deploy::scheduler::updater::backend::db::dbname')} user=%{hiera('swh::deploy::scheduler::updater::backend::db::user')} password=%{hiera('swh::deploy::scheduler::updater::backend::db::password')}"
   cache_read_limit: 1000
 
 swh::deploy::scheduler::updater::consumer::ghtorrent::conf_dir: "%{hiera('swh::conf_directory')}/backend"
@@ -1886,8 +1896,8 @@
     sniff_on_connection_fail: True
     http_compress: false
 
-swh::deploy::loader_debian::db::host: db.internal.softwareheritage.org
-swh::deploy::loader_debian::db::port: 5432
+swh::deploy::loader_debian::db::host: belvedere.internal.softwareheritage.org
+swh::deploy::loader_debian::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::loader_debian::db::user: lister-debian
 # in private data: swh::deploy::loader_debian::db::password
 swh::deploy::loader_debian::db::dbname: lister-debian
@@ -2020,7 +2030,8 @@
 swh::deploy::worker::lister_github::concurrency: 1
 swh::deploy::worker::lister_github::loglevel: warning
 # Contains a password: in private data
-swh::deploy::worker::lister_github::db::host: db
+swh::deploy::worker::lister_github::db::host: belvedere
+swh::deploy::worker::lister_github::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::worker::lister_github::db::dbname: lister-github
 swh::deploy::worker::lister_github::db::user: lister-github
 #swh::deploy::worker::lister_github::db::password in private data
@@ -2030,7 +2041,7 @@
   lister:
     cls: local
     args:
-      db: "postgresql://%{hiera('swh::deploy::worker::lister_github::db::user')}:%{hiera('swh::deploy::worker::lister_github::db::password')}@%{hiera('swh::deploy::worker::lister_github::db::host')}/%{hiera('swh::deploy::worker::lister_github::db::dbname')}"
+      db: "postgresql://%{hiera('swh::deploy::worker::lister_github::db::user')}:%{hiera('swh::deploy::worker::lister_github::db::password')}@%{hiera('swh::deploy::worker::lister_github::db::host')}:%{hiera('swh::deploy::worker::lister_github::db::port')}/%{hiera('swh::deploy::worker::lister_github::db::dbname')}"
   # credentials in private data
   celery:
     task_broker: "%{alias('swh::deploy::worker::task_broker')}"
@@ -2047,7 +2058,8 @@
 swh::deploy::worker::lister_gitlab::concurrency: 1
 swh::deploy::worker::lister_gitlab::loglevel: warning
 # Contains a password: in private data
-swh::deploy::worker::lister_gitlab::db::host: db
+swh::deploy::worker::lister_gitlab::db::host: belvedere
+swh::deploy::worker::lister_gitlab::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::worker::lister_gitlab::db::dbname: lister-gitlab
 swh::deploy::worker::lister_gitlab::db::user: lister-gitlab
 #swh::deploy::worker::lister_gitlab::db::password in private data
@@ -2057,7 +2069,7 @@
   lister:
     cls: local
     args:
-      db: "postgresql://%{hiera('swh::deploy::worker::lister_gitlab::db::user')}:%{hiera('swh::deploy::worker::lister_gitlab::db::password')}@%{hiera('swh::deploy::worker::lister_gitlab::db::host')}/%{hiera('swh::deploy::worker::lister_gitlab::db::dbname')}"
+      db: "postgresql://%{hiera('swh::deploy::worker::lister_gitlab::db::user')}:%{hiera('swh::deploy::worker::lister_gitlab::db::password')}@%{hiera('swh::deploy::worker::lister_gitlab::db::host')}:%{hiera('swh::deploy::worker::lister_gitlab::db::port')}/%{hiera('swh::deploy::worker::lister_gitlab::db::dbname')}"
   # credentials in private data
   celery:
     task_broker: "%{alias('swh::deploy::worker::task_broker')}"
@@ -2074,7 +2086,8 @@
 swh::deploy::worker::lister_pypi::concurrency: 1
 swh::deploy::worker::lister_pypi::loglevel: warning
 # Contains a password: in private data
-swh::deploy::worker::lister_pypi::db::host: db
+swh::deploy::worker::lister_pypi::db::host: belvedere
+swh::deploy::worker::lister_pypi::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::worker::lister_pypi::db::dbname: lister-pypi
 swh::deploy::worker::lister_pypi::db::user: lister-pypi
 #swh::deploy::worker::lister_pypi::db::password in private data
@@ -2084,7 +2097,7 @@
   lister:
     cls: local
     args:
-      db: "postgresql://%{hiera('swh::deploy::worker::lister_pypi::db::user')}:%{hiera('swh::deploy::worker::lister_pypi::db::password')}@%{hiera('swh::deploy::worker::lister_pypi::db::host')}/%{hiera('swh::deploy::worker::lister_pypi::db::dbname')}"
+      db: "postgresql://%{hiera('swh::deploy::worker::lister_pypi::db::user')}:%{hiera('swh::deploy::worker::lister_pypi::db::password')}@%{hiera('swh::deploy::worker::lister_pypi::db::host')}:%{hiera('swh::deploy::worker::lister_pypi::db::port')}/%{hiera('swh::deploy::worker::lister_pypi::db::dbname')}"
   # credentials in private data
   celery:
     task_broker: "%{alias('swh::deploy::worker::task_broker')}"
@@ -2098,7 +2111,8 @@
 swh::deploy::worker::lister_npm::concurrency: 1
 swh::deploy::worker::lister_npm::loglevel: warning
 # Contains a password: in private data
-swh::deploy::worker::lister_npm::db::host: db
+swh::deploy::worker::lister_npm::db::host: belvedere
+swh::deploy::worker::lister_npm::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::worker::lister_npm::db::dbname: lister-npm
 swh::deploy::worker::lister_npm::db::user: lister-npm
 #swh::deploy::worker::lister_npm::db::password in private data
@@ -2108,7 +2122,7 @@
   lister:
     cls: local
     args:
-      db: "postgresql://%{hiera('swh::deploy::worker::lister_npm::db::user')}:%{hiera('swh::deploy::worker::lister_npm::db::password')}@%{hiera('swh::deploy::worker::lister_npm::db::host')}/%{hiera('swh::deploy::worker::lister_npm::db::dbname')}"
+      db: "postgresql://%{hiera('swh::deploy::worker::lister_npm::db::user')}:%{hiera('swh::deploy::worker::lister_npm::db::password')}@%{hiera('swh::deploy::worker::lister_npm::db::host')}:%{hiera('swh::deploy::worker::lister_npm::db::port')}/%{hiera('swh::deploy::worker::lister_npm::db::dbname')}"
   # credentials in private data
   celery:
     task_broker: "%{alias('swh::deploy::worker::task_broker')}"
@@ -2122,7 +2136,8 @@
 swh::deploy::worker::archiver::max_queue_length: 100000
 swh::deploy::worker::archiver::retention_policy: 3
 swh::deploy::worker::archiver::batch_max_size: 5
-swh::deploy::worker::archiver::db::host: db
+swh::deploy::worker::archiver::db::host: belvedere
+swh::deploy::worker::archiver::db::port: "%{alias('swh::deploy::db::secondary::port')}"
 swh::deploy::worker::archiver::db::dbname: softwareheritage-archiver
 swh::deploy::worker::archiver::db::user: "%{hiera('swh::deploy::storage::db::user')}"
 swh::deploy::worker::archiver::db::password: "%{hiera('swh::deploy::storage::db::password')}"
@@ -2137,7 +2152,7 @@
   archiver_storage:
     cls: db
     args:
-      dbconn: "host=%{hiera('swh::deploy::worker::archiver::db::host')} user=%{hiera('swh::deploy::worker::archiver::db::user')}  dbname=%{hiera('swh::deploy::worker::archiver::db::dbname')} password=%{hiera('swh::deploy::worker::archiver::db::password')}"
+      dbconn: "host=%{hiera('swh::deploy::worker::archiver::db::host')} port=%{hiera('swh::deploy::worker::archiver::db::port')} user=%{hiera('swh::deploy::worker::archiver::db::user')} dbname=%{hiera('swh::deploy::worker::archiver::db::dbname')} password=%{hiera('swh::deploy::worker::archiver::db::password')}"
   storages:
     - host: uffizi
       <<: *swh_objstorage_config_uffizi