diff --git a/dockerfiles/swh-deposit/entrypoint.sh b/dockerfiles/swh-deposit/entrypoint.sh
index 82e2bae..41f027c 100755
--- a/dockerfiles/swh-deposit/entrypoint.sh
+++ b/dockerfiles/swh-deposit/entrypoint.sh
@@ -1,40 +1,40 @@
 #!/bin/bash
 
 set -ex
 
 if [[ -d /src ]] ; then
     pwd
     for src_repo in /src/swh-* ; do
         pushd $src_repo
         echo "Installing ${src_repo}"
         pip install -e .
         popd
     done
 fi
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-deposit]
 host=${PGHOST}
 port=5432
 dbname=${POSTGRES_DB}
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 if [ "$1" = 'shell' ] ; then
     exec bash -i
 else
     echo "Waiting for postgresql to start"
-    until psql service=swh-deposit -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
+    until psql postgresql:///?service=swh-deposit -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
 
     echo "Migrating db"
     django-admin migrate --settings=swh.deposit.settings.production
 
     echo "starting swh-deposit server"
     exec gunicorn --bind 0.0.0.0:5006 \
                   --reload \
                   --log-level DEBUG \
                   swh.deposit.wsgi
 fi
diff --git a/dockerfiles/swh-indexer-storage/entrypoint.sh b/dockerfiles/swh-indexer-storage/entrypoint.sh
index 50189f6..6ea3a8a 100755
--- a/dockerfiles/swh-indexer-storage/entrypoint.sh
+++ b/dockerfiles/swh-indexer-storage/entrypoint.sh
@@ -1,45 +1,45 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo will NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-indexer]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 
     echo Waiting for postgresql to start
-    until psql service=swh-indexer -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
+    until psql postgresql:///?service=swh-indexer -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
 
     echo Setup the database
     PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init indexer \
           --db-name ${POSTGRES_DB}
 
     echo Starting the swh-indexer-storage API server
         exec python -m swh.indexer.storage.api.server /indexer_storage
     ;;
 esac
diff --git a/dockerfiles/swh-indexer-storage/indexer_storage.yml b/dockerfiles/swh-indexer-storage/indexer_storage.yml
index 657ee90..c0975ee 100644
--- a/dockerfiles/swh-indexer-storage/indexer_storage.yml
+++ b/dockerfiles/swh-indexer-storage/indexer_storage.yml
@@ -1,4 +1,4 @@
 indexer_storage:
   cls: local
   args:
-    db: service=swh-indexer
+    db: postgresql:///?service=swh-indexer
diff --git a/dockerfiles/swh-loaders-worker/loader.yml b/dockerfiles/swh-loaders-worker/loader.yml
index f977304..1cd88c8 100644
--- a/dockerfiles/swh-loaders-worker/loader.yml
+++ b/dockerfiles/swh-loaders-worker/loader.yml
@@ -1,5 +1,5 @@
 storage:
   cls: remote
   args:
     url: http://swh-storage:5002/
-lister_db_url: service=swh
+lister_db_url: postgresql:///?service=swh
diff --git a/dockerfiles/swh-scheduler-api/entrypoint.sh b/dockerfiles/swh-scheduler-api/entrypoint.sh
index 9efee25..30aea82 100755
--- a/dockerfiles/swh-scheduler-api/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-api/entrypoint.sh
@@ -1,44 +1,44 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         pip install -e .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-scheduler]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     "swh-scheduler")
         exec $@
         ;;
     *)
         echo Waiting for postgresql to start
-        until psql service=swh-scheduler -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
+        until psql postgresql:///?service=swh-scheduler -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
 
         echo Setup the swh-scheduler API database
         PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init scheduler \
                   --db-name ${POSTGRES_DB}
 
         echo Starting the swh-scheduler API server
         exec swh-scheduler api-server /scheduler.yml
 esac
diff --git a/dockerfiles/swh-scheduler-worker/scheduler.yml b/dockerfiles/swh-scheduler-worker/scheduler.yml
index 415a523..526cd12 100644
--- a/dockerfiles/swh-scheduler-worker/scheduler.yml
+++ b/dockerfiles/swh-scheduler-worker/scheduler.yml
@@ -1,2 +1,2 @@
 task_broker: amqp://guest:guest@amqp//
-scheduling_db: service=swh-scheduler
+scheduling_db: postgresql:///?service=swh-scheduler
diff --git a/dockerfiles/swh-storage-listener/entrypoint.sh b/dockerfiles/swh-storage-listener/entrypoint.sh
index b6b7a03..7b79fc2 100755
--- a/dockerfiles/swh-storage-listener/entrypoint.sh
+++ b/dockerfiles/swh-storage-listener/entrypoint.sh
@@ -1,38 +1,38 @@
 #!/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 0600 ~/.pgpass
 
 echo Installed Python packages:
 pip list
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       echo "Waiting for postgresql to start"
-      until psql service=swh -c "select 1" 1>&2 >/dev/null; do sleep 0.1; done
+      until psql postgresql:///?service=swh -c "select 1" 1>&2 >/dev/null; do sleep 0.1; done
 
       echo "Starting swh-storage's listener"
       exec python3 -m swh.storage.listener --verbose
       ;;
 esac
diff --git a/dockerfiles/swh-storage-listener/listener.yml b/dockerfiles/swh-storage-listener/listener.yml
index a5f482b..6eaeba6 100644
--- a/dockerfiles/swh-storage-listener/listener.yml
+++ b/dockerfiles/swh-storage-listener/listener.yml
@@ -1,4 +1,4 @@
-database: service=swh
+database: postgresql:///?service=swh
 brokers:
   - kafka
 topic_prefix: swh.tmp.journal.new
diff --git a/dockerfiles/swh-storage/entrypoint.sh b/dockerfiles/swh-storage/entrypoint.sh
index 988a4b0..b5230db 100755
--- a/dockerfiles/swh-storage/entrypoint.sh
+++ b/dockerfiles/swh-storage/entrypoint.sh
@@ -1,42 +1,42 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
       pushd $srcrepo
       pip install -e .
       popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 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 0600 ~/.pgpass
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       echo Waiting for postgresql to start
-      until psql service=swh -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
+      until psql postgresql:///?service=swh -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
 
       echo Setup the database
       PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init storage \
           --db-name ${POSTGRES_DB}
 
       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 0aeaff9..c4dc0ec 100644
--- a/dockerfiles/swh-storage/storage.yml
+++ b/dockerfiles/swh-storage/storage.yml
@@ -1,8 +1,8 @@
 storage:
   cls: local
   args:
-    db: service=swh
+    db: postgresql:///?service=swh
     objstorage:
       cls: remote
       args:
-        url: http://swh-objstorage:5003/ # FIXME: this should not be hardcoded
+        url: http://swh-objstorage:5003/