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
@@ -12,7 +12,7 @@
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
-[swh]
+[swh-scheduler]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
@@ -27,7 +27,7 @@
         ;;
     *)
 		echo Waiting for postgresql to start
-		until psql service=swh -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
+		until psql 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-api/scheduler.yml b/dockerfiles/swh-scheduler-api/scheduler.yml
--- a/dockerfiles/swh-scheduler-api/scheduler.yml
+++ b/dockerfiles/swh-scheduler-api/scheduler.yml
@@ -1,4 +1,4 @@
 scheduler:
   cls: local
   args:
-    db: service=swh
+    scheduling_db: service=swh-scheduler
diff --git a/dockerfiles/swh-scheduler-worker/entrypoint.sh b/dockerfiles/swh-scheduler-worker/entrypoint.sh
--- a/dockerfiles/swh-scheduler-worker/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-worker/entrypoint.sh
@@ -12,7 +12,7 @@
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
-[swh]
+[swh-scheduler]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
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@amqp//
-scheduling_db: service=swh
+scheduling_db: service=swh-scheduler