diff --git a/dockerfiles/swh-storage/entrypoint.sh b/dockerfiles/swh-storage/entrypoint.sh
index bfe498f..36d515a 100755
--- a/dockerfiles/swh-storage/entrypoint.sh
+++ b/dockerfiles/swh-storage/entrypoint.sh
@@ -1,27 +1,35 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
 	for srcrepo in /src/swh-* ; do
 		pushd $srcrepo
 		pip install -e .
 		popd
 	done
 fi
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
+cat > ~/.pg_service.conf <<EOF
+[swh]
+dbname=${POSTGRES_DB}
+host=${PGHOST}
+port=5432
+user=${PGUSER}
+EOF
+
 chmod 0400 ~/.pgpass
 
 case "$1" in
 	"shell")
 		exec bash -i
 		;;
 	"init")
 		echo Setup the database
 		swh-db-init storage --db-name ${POSTGRES_DB} --no-create True
 		;;
 	*)
 		echo Starting the swh-storage API server
 		exec python -m swh.storage.api.server /storage.yml
 esac
diff --git a/dockerfiles/swh-storage/storage.yml b/dockerfiles/swh-storage/storage.yml
index 6ed062a..0aeaff9 100644
--- a/dockerfiles/swh-storage/storage.yml
+++ b/dockerfiles/swh-storage/storage.yml
@@ -1,8 +1,8 @@
 storage:
   cls: local
   args:
-    db: "host=swh-storage-db port=5432 user=postgres password=testpassword" # FIXME: this should not be hardcoded
+    db: service=swh
     objstorage:
       cls: remote
       args:
         url: http://swh-objstorage:5003/ # FIXME: this should not be hardcoded