diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index 8f3a84b0111c51a28981482219f6b25add3d50aa..6d5a1b53e107bc0e9756fd4dc8ce14aa4470298a 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -60,7 +60,7 @@ RUN useradd --uid ${UID} --create-home etherpad
 COPY --from=downloader --chown=etherpad /opt/etherpad-lite /opt/etherpad-lite/
 
 RUN apt-get update && \
-    apt-get install -y curl default-mysql-client && \
+    apt-get install -y curl default-mysql-client postgresql-client && \
     chmod +x /opt/etherpad-lite/entrypoint.sh && \
     usermod -d /opt/etherpad-lite etherpad && \
     chown -R etherpad /opt/etherpad-lite && \
diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh
index 22b00ad0e1f5772c78325c324cbf5a7be6691b25..d1fda49a0871658d79193f5640c51cb7dfb7a5c8 100644
--- a/pica-etherpad/entrypoint.sh
+++ b/pica-etherpad/entrypoint.sh
@@ -22,7 +22,7 @@ if [ -z "${DB_HOST}" ]; then
 	exit 1
 fi
 
-while ! mysqladmin ping -u${DB_USER} -p${DB_PASSWORD} -h"${DB_HOST}" &>/dev/null; do
+while ! { mysqladmin ping -u${DB_USER} -p${DB_PASSWORD} -h"${DB_HOST}" &>/dev/null || PGPASSWORD=${DB_PASSWORD} psql -h${DB_HOST} -U${DB_USER} -c "SELECT 1" }; do
 		echo "Database server not ready yet, re-trying in 5 seconds..."
     sleep 5
 done
diff --git a/pica-etherpad/secrets/etherpad-week-db.secrets.example b/pica-etherpad/secrets/etherpad-week-db.secrets.example
index 96af56a51974afd9c08fa6835a390651f27a6136..4d5e0fab839c33de6e9f68575058c28597f8d093 100644
--- a/pica-etherpad/secrets/etherpad-week-db.secrets.example
+++ b/pica-etherpad/secrets/etherpad-week-db.secrets.example
@@ -1 +1,3 @@
 POSTGRES_PASSWORD=password
+POSTGRES_USER=etherpad
+POSTGRES_DB=etherpad-lite