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
@@ -26,12 +26,12 @@
         exec bash -i
         ;;
     *)
-		echo Waiting for postgresql to start
-		until psql service=swh -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
+        echo Waiting for postgresql to start
+        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 \
-				  --db-name ${POSTGRES_DB}
+                  --db-name ${POSTGRES_DB}
 
         echo Starting the swh-scheduler API server
         exec python -m swh.scheduler.api.server /scheduler.yml
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
@@ -28,7 +28,7 @@
     "listener")
         echo Starting the swh-scheduler listener
         exec python -m swh.scheduler.celery_backend.listener
-		;;
+        ;;
     "runner")
         echo Starting the swh-scheduler runner
         exec sh -c 'while true; do
@@ -36,9 +36,9 @@
             python -m swh.scheduler.celery_backend.runner;
             sleep 10;
           done'  # beuark
-		;;
-	*)
-		echo "Provide a command (shell|listener|runner)"
-		exit 1
-		;;
+        ;;
+    *)
+        echo "Provide a command (shell|listener|runner)"
+        exit 1
+        ;;
 esac
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
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
@@ -27,8 +27,8 @@
         ;;
     *)
 
-    echo Waiting for postgresql to start
-    until psql service=swh -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
+	echo Waiting for postgresql to start
+	until psql 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 \
@@ -36,5 +36,5 @@
 
 	echo Starting the swh-storage API server
         exec python -m swh.storage.api.server /storage.yml
-	;;
+    ;;
 esac
diff --git a/dockerfiles/swh-web/entrypoint.sh b/dockerfiles/swh-web/entrypoint.sh
--- a/dockerfiles/swh-web/entrypoint.sh
+++ b/dockerfiles/swh-web/entrypoint.sh
@@ -19,7 +19,7 @@
     # --insecure to serve the static css/js
     # 0.0.0.0 so that we can actually reach the service.
     exec python3 -m swh.web.manage runserver \
-	 --verbosity 3 \
-	 --insecure \
-	 0.0.0.0:5004
+         --verbosity 3 \
+         --insecure \
+         0.0.0.0:5004
 fi