diff --git a/data/hostname/storage0.internal.staging.swh.network.yaml b/data/hostname/storage0.internal.staging.swh.network.yaml
index 98cb1128..935347fd 100644
--- a/data/hostname/storage0.internal.staging.swh.network.yaml
+++ b/data/hostname/storage0.internal.staging.swh.network.yaml
@@ -1,50 +1,40 @@
 networks:
   default:
     interface: eth0
     address: 192.168.128.2
     netmask: 255.255.255.0
     gateway: 192.168.128.1
 
-swh::deploy::storage::db::host: db0.internal.staging.swh.network
-swh::deploy::storage::db::port: 5432
-swh::deploy::storage::db::user: swh
-swh::deploy::storage::db::dbname: swh
-
-swh::deploy::indexer::storage::db::host: db0.internal.staging.swh.network
-swh::deploy::indexer::storage::db::port: 5432
-swh::deploy::indexer::storage::db::user: swh-indexer
-swh::deploy::indexer::storage::db::dbname: swh-indexer
-
 # Deploy the storage server as a public resource
 swh::deploy::storage::backend::listen::host: 0.0.0.0
 swh::deploy::storage::backend::workers: 4
 swh::deploy::storage::backend::max_requests: 100
 swh::deploy::storage::backend::max_requests_jitter: 10
 swh::deploy::storage::config:
   storage:
     cls: local
     args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
+      db: service=admin-staging-swh
       objstorage:
         cls: pathslicing
         args:
           root: "%{hiera('swh::deploy::storage::directory')}"
           slicing: "%{hiera('swh::deploy::storage::directory')}"
 
 swh::deploy::objstorage::directory: "%{hiera('swh::deploy::storage::directory')}"
 swh::deploy::objstorage::slicing: 0:1/1:5
 
 # Deploy the indexer storage server as a public resource
 swh::deploy::indexer::storage::backend::listen::host: 0.0.0.0
 swh::deploy::indexer::storage::backend::workers: 4
 swh::deploy::indexer::storage::config:
   indexer_storage:
     cls: local
     args:
-      db: "host=%{hiera('swh::deploy::indexer::storage::db::host')} port=%{hiera('swh::deploy::indexer::storage::db::port')} user=%{hiera('swh::deploy::indexer::storage::db::user')} dbname=%{hiera('swh::deploy::indexer::storage::db::dbname')} password=%{hiera('swh::deploy::indexer::storage::db::password')}"
+      db: service=admin-staging-swh-indexer
 
 # open objstorage api
 swh::deploy::objstorage::backend::listen::host: 0.0.0.0
 swh::deploy::objstorage::backend::workers: 4
 
 nginx::worker_processes: 4
diff --git a/manifests/site.pp b/manifests/site.pp
index 610a475b..1433aa9f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,131 +1,132 @@
 node 'louvre.internal.softwareheritage.org' {
   include role::swh_server
 }
 
 node /^(orsay|beaubourg|hypervisor\d+)\.(internal\.)?softwareheritage\.org$/
 {
   include role::swh_hypervisor
 }
 
 node 'pergamon.softwareheritage.org' {
   include role::swh_sysadmin
   include profile::export_archive_counters
 }
 
 node 'tate.softwareheritage.org' {
   include role::swh_forge
 }
 
 node 'moma.softwareheritage.org' {
   include role::swh_api
 }
 
 node 'webapp0.softwareheritage.org' {
   include role::swh_base_api
 }
 
 node 'saatchi.internal.softwareheritage.org' {
   include role::swh_scheduler
 }
 
 node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ {
   include role::swh_database
   include profile::pgbouncer
 }
 
 node 'banco.softwareheritage.org' {
   include role::swh_backup
   include role::postgresql_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\.(internal\.)?softwareheritage\.org$/ {
   include role::swh_storage_baremetal
 }
 
 node /^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' {
   include role::swh_desktop
 }
 
 node /^db0.internal.staging.swh.network$/ {
   include role::swh_base_database
   include profile::postgresql::server
   include profile::pgbouncer
   include ::profile::devel::postgres
 }
 
 node 'gateway.internal.staging.swh.network' {
   include role::swh_gateway
 }
 
 node /^storage0\.internal\.staging\.swh\.network$/ {
   include role::swh_base_storage
+  include ::profile::devel::postgres
 }
 
 node default {
   include role::swh_base
   include profile::puppet::agent
 }
diff --git a/site-modules/profile/manifests/swh/deploy/storage.pp b/site-modules/profile/manifests/swh/deploy/storage.pp
index aff51f44..c2d4504c 100644
--- a/site-modules/profile/manifests/swh/deploy/storage.pp
+++ b/site-modules/profile/manifests/swh/deploy/storage.pp
@@ -1,21 +1,21 @@
 # Deployment of the swh.storage.api server
 
 class profile::swh::deploy::storage {
   include ::profile::swh::deploy::base_storage
 
   package {'python3-swh.storage':
     ensure => 'present',
   } ~> ::profile::swh::deploy::rpc_server {'storage':
     executable        => 'swh.storage.api.wsgi',
     worker            => 'sync',
-    http_check_string => '<title>Software Heritage storage server</title>'
+    http_check_string => '<title>Software Heritage storage server</title>',
   }
 
   $storage_config = lookup('swh::deploy::storage::config')['storage']
 
   if ($storage_config['cls'] == 'local'
       and $storage_config['args']['journal_writer']
       and $storage_config['args']['journal_writer']['cls'] == 'kafka') {
     include ::profile::swh::deploy::journal
   }
 }