diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -2946,97 +2946,89 @@
   - alias: admin-swh
     name: "%{hiera('swh::deploy::storage::db::dbname')}"
     host: "%{hiera('swh::deploy::storage::db::host')}"
-    user: "%{hiera('swh::deploy::storage::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::storage::db::user')}"
     password: "%{hiera('swh::deploy::storage::db::password')}"
   - alias: admin-swh-deposit
     name: "%{hiera('swh::deploy::deposit::db::dbname')}"
     host: "%{hiera('swh::deploy::deposit::db::host')}"
-    user: "%{hiera('swh::deploy::deposit::db::dbuser')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::deposit::db::dbuser')}"
     password: "%{hiera('swh::deploy::deposit::db::password')}"
   - alias: admin-swh-scheduler
     name: "%{hiera('swh::deploy::scheduler::db::dbname')}"
     host: "%{hiera('swh::deploy::scheduler::db::host')}"
-    user: "%{hiera('swh::deploy::scheduler::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::scheduler::db::user')}"
     password: "%{hiera('swh::deploy::scheduler::db::password')}"
   - alias: admin-swh-vault
     name: "%{hiera('swh::deploy::vault::db::dbname')}"
     host: "%{hiera('swh::deploy::vault::db::host')}"
-    user: "%{hiera('swh::deploy::vault::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::vault::db::user')}"
     password: "%{hiera('swh::deploy::vault::db::password')}"
   - alias: admin-swh-lister
     name: "%{hiera('swh::deploy::worker::lister::db::name')}"
     host: "%{hiera('swh::deploy::worker::lister::db::host')}"
-    user: "%{hiera('swh::deploy::worker::lister::db::name')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::worker::lister::db::name')}"
     password: "%{hiera('swh::deploy::lister::db::password')}"
   - alias: admin-swh-replica
     name: "%{hiera('swh::deploy::storage::db::dbname')}"
     host: somerset.internal.softwareheritage.org
-    user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
     password: "%{hiera('swh::deploy::storage::db::password')}"
   - alias: admin-swh-indexer
     name: "%{hiera('swh::deploy::indexer::storage::db::dbname')}"
     host: "%{hiera('swh::deploy::indexer::storage::db::host')}"
-    user: "%{hiera('swh::deploy::indexer::storage::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::indexer::storage::db::user')}"
     password: "%{hiera('swh::deploy::indexer::storage::db::password')}"
   - alias: admin-swh-web
     name: "%{hiera('swh::deploy::webapp::db::name')}"
     host: "%{hiera('swh::deploy::webapp::db::host')}"
-    user: "%{hiera('swh::deploy::webapp::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
+    user: "%{hiera('swh::deploy::webapp::db::user')}"
     password: "%{hiera('swh::deploy::webapp::db::password')}"
   - alias: swh
     name: "%{hiera('swh::deploy::storage::db::dbname')}"
     host: "%{hiera('swh::deploy::storage::db::host')}"
-    user: "%{hiera('swh::deploy::storage::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: swh-deposit
     name: "%{hiera('swh::deploy::deposit::db::dbname')}"
     host: "%{hiera('swh::deploy::deposit::db::host')}"
-    user: "%{hiera('swh::deploy::deposit::db::dbuser')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: swh-scheduler
     name: "%{hiera('swh::deploy::scheduler::db::dbname')}"
     host: "%{hiera('swh::deploy::scheduler::db::host')}"
-    user: "%{hiera('swh::deploy::scheduler::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: swh-vault
     name: "%{hiera('swh::deploy::vault::db::dbname')}"
     host: "%{hiera('swh::deploy::vault::db::host')}"
-    user: "%{hiera('swh::deploy::vault::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: swh-lister
     name: "%{hiera('swh::deploy::worker::lister::db::name')}"
     host: "%{hiera('swh::deploy::worker::lister::db::host')}"
-    user: "%{hiera('swh::deploy::worker::lister::db::name')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: swh-replica
     name: "%{hiera('swh::deploy::storage::db::dbname')}"
     host: somerset.internal.softwareheritage.org
-    user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: swh-indexer
     name: "%{hiera('swh::deploy::indexer::storage::db::dbname')}"
     host: "%{hiera('swh::deploy::indexer::storage::db::host')}"
-    user: "%{hiera('swh::deploy::indexer::storage::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: swh-web
     name: "%{hiera('swh::deploy::webapp::db::name')}"
     host: "%{hiera('swh::deploy::webapp::db::host')}"
-    user: "%{hiera('swh::deploy::webapp::db::user')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest