diff --git a/support/docker/gitpod/Dockerfile b/support/docker/gitpod/Dockerfile
index d92cd22cf..8f7223d85 100644
--- a/support/docker/gitpod/Dockerfile
+++ b/support/docker/gitpod/Dockerfile
@@ -8,4 +8,4 @@ RUN sudo apt-get update -q && sudo apt-get install -qy \
 
 # Set up PostgreSQL.
 COPY --chown=gitpod:gitpod support/docker/gitpod/setup_postgres.sql /tmp/
-RUN pg_start && psql -h localhost -d postgres --file=/tmp/setup_postgres.sql
+RUN pg_start && psql -h localhost -d postgres --file=/tmp/setup_postgres.sql && pg_stop