diff --git a/data/hostname/met.internal.softwareheritage.org.yaml b/data/hostname/met.internal.softwareheritage.org.yaml
index 0951deeb..fabd090b 100644
--- a/data/hostname/met.internal.softwareheritage.org.yaml
+++ b/data/hostname/met.internal.softwareheritage.org.yaml
@@ -1,299 +1,233 @@
 backups::exclude:
   - var/lib/rabbitmq
 
 users:
-  ardumont:
-    groups:
-      - docker
-  aeviso:
-    groups:
-      - sudo
-      - docker
   ddouard:
     groups:
       - sudo
-      - docker
   jayesh:
     groups:
       - sudo
-      - docker
-  olasd:
-    groups:
-      - docker
-  vsellier:
-    groups:
-      - docker
-  zack:
-    groups:
-      - docker
 
 icinga2::host::vars:
   load: high
 
 swh::apt_config::enable_non_free: true
 packages:
   - intel-microcode
   # install zfs
   - zfs-dkms
 
 rabbitmq::server::users:
   - name: "swh-provenance"
     is_admin: true
     password: "%{hiera('rabbitmq::monitoring::provenance::password')}"
     tags: []
   - name: swh-provenance-consumer
     is_admin: false
     password: "%{hiera('swh::deploy::provenance::consumer::password')}"
     tags: []
   - name: swh-provenance-producer
     is_admin: false
     password: "%{hiera('swh::deploy::provenance::producer::password')}"
     tags: []
 
 swh::postgresql::version: 13
 
 swh::postgresql::listen_addresses:
   - 0.0.0.0
 swh::postgresql::port: 5433
 swh::postgresql::cluster_name: "%{lookup('swh::postgresql::version')}/main"
 swh::postgresql::datadir_base: "%{lookup('swh::base_directory')}/postgres"
 swh::postgresql::datadir: "%{lookup('swh::postgresql::datadir_base')}/%{lookup('swh::postgresql::cluster_name')}"
 swh::postgresql::network_accesses:
   - 192.168.100.0/24 # Monitoring
   - 192.168.100.0/24 # Internal network
 
 # using an indirection to allow the override for vagrant
 swh::postgresql::shared_buffers: "%{lookup('swh::provenance::db::shared_buffers')}"
 swh::postgresql::max_connections: 1000
 
 postgresql::server::config_entries:
   shared_buffers: "%{alias('swh::postgresql::shared_buffers')}"
   cluster_name: "%{alias('swh::postgresql::cluster_name')}"
 
 swh::dbs:
   provenance:
     name: "%{hiera('swh::deploy::provenance::db::dbname')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
   test0:
     name: test0
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test1:
     name: test1
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test2:
     name: test2
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test3:
     name: test3
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test4:
     name: test4
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test5:
     name: test5
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test6:
     name: test6
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test7:
     name: test7
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test8:
     name: test8
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   test9:
     name: test9
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
 
 # What aliases to install in .pg_service/.pgpass
 swh::postgres::service::dbs:
   - alias: swh-provenance
     name: "%{hiera('swh::deploy::provenance::db::dbname')}"
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: admin-swh-provenance
     name: "%{hiera('swh::deploy::provenance::db::dbname')}"
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test0
     name: test0
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test0-admin
     name: test0
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test1
     name: test1
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test1-admin
     name: test1
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test2
     name: test2
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test2-admin
     name: test2
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test3
     name: test3
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test3-admin
     name: test3
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test4
     name: test4
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test4-admin
     name: test4
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test5
     name: test5
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test5-admin
     name: test5
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test6
     name: test6
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test6-admin
     name: test6
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test7
     name: test7
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test7-admin
     name: test7
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test8
     name: test8
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test8-admin
     name: test8
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
   - alias: test9
     name: test9
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: guest
   - alias: test9-admin
     name: test9
     host: "%{hiera('swh::deploy::provenance::db::host')}"
     port: "%{hiera('swh::deploy::db::pgbouncer::port')}"
     user: "%{hiera('swh::deploy::provenance::db::user')}"
     password: "%{hiera('swh::deploy::provenance::db::password')}"
 
 
 # Install the .pg_service/.pgpass files to those users
 swh::postgres::service::users:
   - root
   - zack
   - ardumont
   - aeviso
   - vsellier
 
-pgbouncer::auth_hba_file: /etc/postgresql/13/main/pg_hba.conf
-pgbouncer::listen_addr: 192.168.100.110
-pgbouncer::databases:
-  - source_db: "%{hiera('swh::deploy::provenance::db::dbname')}"
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test0
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test1
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test2
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test3
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test4
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test5
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test6
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test7
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test8
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-  - source_db: test9
-    host: "%{hiera('swh::deploy::provenance::db::host')}"
-    auth_user: "%{hiera('swh::deploy::db::pgbouncer::user::login')}"
-    port: "%{hiera('swh::deploy::db::main::port')}"
-
 prometheus::rabbitmq::listen_port: 15692