diff --git a/dockerfiles/swh-deposit/entrypoint.sh b/dockerfiles/swh-deposit/entrypoint.sh
--- a/dockerfiles/swh-deposit/entrypoint.sh
+++ b/dockerfiles/swh-deposit/entrypoint.sh
@@ -27,7 +27,7 @@
     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
diff --git a/dockerfiles/swh-indexer-storage/entrypoint.sh b/dockerfiles/swh-indexer-storage/entrypoint.sh
--- a/dockerfiles/swh-indexer-storage/entrypoint.sh
+++ b/dockerfiles/swh-indexer-storage/entrypoint.sh
@@ -33,7 +33,7 @@
     *)
 
     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 \
diff --git a/dockerfiles/swh-indexer-storage/indexer_storage.yml b/dockerfiles/swh-indexer-storage/indexer_storage.yml
--- 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
--- a/dockerfiles/swh-loaders-worker/loader.yml
+++ b/dockerfiles/swh-loaders-worker/loader.yml
@@ -2,4 +2,4 @@
   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
--- a/dockerfiles/swh-scheduler-api/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-api/entrypoint.sh
@@ -33,7 +33,7 @@
         ;;
     *)
         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 \
diff --git a/dockerfiles/swh-scheduler-worker/scheduler.yml b/dockerfiles/swh-scheduler-worker/scheduler.yml
--- 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
--- a/dockerfiles/swh-storage-listener/entrypoint.sh
+++ b/dockerfiles/swh-storage-listener/entrypoint.sh
@@ -30,7 +30,7 @@
       ;;
     *)
       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
diff --git a/dockerfiles/swh-storage-listener/listener.yml b/dockerfiles/swh-storage-listener/listener.yml
--- 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
--- a/dockerfiles/swh-storage/entrypoint.sh
+++ b/dockerfiles/swh-storage/entrypoint.sh
@@ -30,7 +30,7 @@
       ;;
     *)
       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 \
diff --git a/dockerfiles/swh-storage/storage.yml b/dockerfiles/swh-storage/storage.yml
--- 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/