diff --git a/data/hostname/storage0.internal.staging.swh.network.yaml b/data/hostname/storage0.internal.staging.swh.network.yaml
index 935347fd..d0dda964 100644
--- a/data/hostname/storage0.internal.staging.swh.network.yaml
+++ b/data/hostname/storage0.internal.staging.swh.network.yaml
@@ -1,40 +1,43 @@
 networks:
   default:
     interface: eth0
     address: 192.168.128.2
     netmask: 255.255.255.0
     gateway: 192.168.128.1
 
+swh::postgres::service::users:
+  - swhstorage
+
 # 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: 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: 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/site-modules/profile/manifests/devel/postgres.pp b/site-modules/profile/manifests/devel/postgres.pp
index 5461a1c0..b27d8afc 100644
--- a/site-modules/profile/manifests/devel/postgres.pp
+++ b/site-modules/profile/manifests/devel/postgres.pp
@@ -1,36 +1,36 @@
 class profile::devel::postgres {
   $packages = lookup('packages::devel::postgres', Array, 'unique')
 
   package { $packages:
     ensure => present,
   }
 
   $dbs = lookup('swh::postgres::service::dbs', Array, 'deep')
 
   # Explicitly install the configuration files per user's home
   # TL;DR the pgpass must be readonly per user so we can't use the global one
   $users = lookup('swh::postgres::service::users', Array, 'deep')
   each ($users) | $user | {
     if $user == 'root' {
       $home = '/root'
     } else {
       $home = "/home/${user}"
     }
 
     file {"${home}/.pg_service.conf":
       ensure  => file,
       content => template('profile/postgres/pg_service.conf.erb'),
-      user => $user,
-      group => $user,
-      mode => '0400',
+      owner   => $user,
+      group   => $user,
+      mode    => '0400',
     }
     file {"${home}/.pgpass":
       ensure  => file,
       content => template('profile/postgres/pgpass.conf.erb'),
-      user => $user,
-      group => $user,
-      mode => '0400',
+      owner   => $user,
+      group   => $user,
+      mode    => '0400',
     }
   }
 
 }