diff --git a/services/swh-indexer-storage/entrypoint.sh b/services/swh-indexer-storage/entrypoint.sh
index 0eec97f..4375401 100755
--- a/services/swh-indexer-storage/entrypoint.sh
+++ b/services/swh-indexer-storage/entrypoint.sh
@@ -1,32 +1,32 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 
     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 \
          --reload \
          --threads 2 \
          --workers 2 \
          --log-level DEBUG \
          --timeout 3600 \
          swh.indexer.storage.api.wsgi
     ;;
 esac
diff --git a/services/swh-scheduler-api/entrypoint.sh b/services/swh-scheduler-api/entrypoint.sh
index f8e618f..bfd78c4 100755
--- a/services/swh-scheduler-api/entrypoint.sh
+++ b/services/swh-scheduler-api/entrypoint.sh
@@ -1,34 +1,34 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     "swh-scheduler")
         exec $@
         ;;
     *)
         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 \
              --log-level DEBUG \
              --threads 2 \
              --workers 2 \
              --reload \
              --timeout 3600 \
              swh.scheduler.api.wsgi
 
 esac
diff --git a/services/swh-storage-replayer/entrypoint.sh b/services/swh-storage-replayer/entrypoint.sh
index 47a7e88..382d52c 100755
--- a/services/swh-storage-replayer/entrypoint.sh
+++ b/services/swh-storage-replayer/entrypoint.sh
@@ -1,28 +1,28 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       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 \
 		   --broker kafka \
 		   --prefix swh.journal.objects \
 		   --consumer-id swh.storage.replica
       ;;
 esac
diff --git a/services/swh-storage/entrypoint.sh b/services/swh-storage/entrypoint.sh
index f095783..a7ee3ef 100755
--- a/services/swh-storage/entrypoint.sh
+++ b/services/swh-storage/entrypoint.sh
@@ -1,45 +1,45 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 if [ "$STORAGE_BACKEND" = "postgresql" ]; then
     source /srv/softwareheritage/utils/pgsql.sh
     setup_pgsql
 
 elif [ "$STORAGE_BACKEND" = "cassandra" ]; then
     echo Waiting for Cassandra to start
     wait-for-it ${CASSANDRA_SEED}:9042 -s --timeout=0
     echo Creating keyspace
     cat << EOF | python3
 from swh.storage.cassandra import create_keyspace
 create_keyspace(['cassandra-seed'], 'swh')
 EOF
 
 fi
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       if [ "$STORAGE_BACKEND" = "postgresql" ]; then
           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
       exec gunicorn --bind 0.0.0.0:5002 \
            --reload \
            --threads 4 \
            --workers 2 \
            --log-level DEBUG \
            --timeout 3600 \
            swh.storage.api.wsgi
       ;;
 esac