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
@@ -25,11 +25,11 @@
     "shell")
         exec bash -i
         ;;
-    "init")
-        echo Setup the database
-        swh-db-init storage --db-name ${POSTGRES_DB} --no-create True
-        ;;
     *)
-        echo Starting the swh-storage API server
+	echo Setup the database
+	PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init storage \
+		  --db-name ${POSTGRES_DB}
+	echo Starting the swh-storage API server
         exec python -m swh.storage.api.server /storage.yml
+	;;
 esac