diff --git a/services/swh-indexer-storage/entrypoint.sh b/services/swh-indexer-storage/entrypoint.sh
--- a/services/swh-indexer-storage/entrypoint.sh
+++ b/services/swh-indexer-storage/entrypoint.sh
@@ -17,8 +17,8 @@
     wait_pgsql
 
     echo Setup the database
-    PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init indexer \
-          --db-name ${POSTGRES_DB}
+    PGPASSWORD=${POSTGRES_PASSWORD} swh db-init \
+          --db-name ${POSTGRES_DB} indexer
 
     echo Starting the swh-indexer-storage API server
     exec gunicorn --bind 0.0.0.0:5007 \
diff --git a/services/swh-scheduler-api/entrypoint.sh b/services/swh-scheduler-api/entrypoint.sh
--- a/services/swh-scheduler-api/entrypoint.sh
+++ b/services/swh-scheduler-api/entrypoint.sh
@@ -19,8 +19,8 @@
         wait_pgsql
 
         echo Setup the swh-scheduler API database
-        PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init scheduler \
-                  --db-name ${POSTGRES_DB}
+        PGPASSWORD=${POSTGRES_PASSWORD} swh db-init \
+            --db-name ${POSTGRES_DB} scheduler
 
         echo Starting the swh-scheduler API server
         exec gunicorn --bind 0.0.0.0:5008 \
diff --git a/services/swh-storage-replayer/entrypoint.sh b/services/swh-storage-replayer/entrypoint.sh
--- a/services/swh-storage-replayer/entrypoint.sh
+++ b/services/swh-storage-replayer/entrypoint.sh
@@ -16,8 +16,8 @@
       wait_pgsql
 
       echo Setup the database
-      PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init storage \
-          --db-name ${POSTGRES_DB}
+      PGPASSWORD=${POSTGRES_PASSWORD} swh db-init \
+          --db-name ${POSTGRES_DB} storage
 
       echo Starting the swh-storage Kafka storage replayer
       exec swh-journal replay \
diff --git a/services/swh-storage/entrypoint.sh b/services/swh-storage/entrypoint.sh
--- a/services/swh-storage/entrypoint.sh
+++ b/services/swh-storage/entrypoint.sh
@@ -29,8 +29,8 @@
           wait_pgsql
 
           echo Setup the database
-          PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init storage \
-              --db-name ${POSTGRES_DB}
+          PGPASSWORD=${POSTGRES_PASSWORD} swh db-init \
+              --db-name ${POSTGRES_DB} storage
       fi
 
       echo Starting the swh-storage API server