diff --git a/.gitpod.yml b/.gitpod.yml
index c2f2fa464..4ccaeabe3 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -10,7 +10,11 @@ ports:
 - port: 9000
   onOpen: ignore
 tasks:
-- command: redis-server
-- before: export NODE_CONFIG="{\"import\":{\"videos\":{\"torrent\":{\"enabled\":false}}},\"webserver\":{\"hostname\":\"$(gp url 3000 | cut -d/ -f3)\",\"port\":\"443\",\"https\":true}}"
-  init: yarn install --pure-lockfile
-  command: npm run dev
\ No newline at end of file
+- name: Redis
+  command: redis-server
+- name: PeerTube
+  before: export NODE_CONFIG="{\"import\":{\"videos\":{\"torrent\":{\"enabled\":false}}},\"webserver\":{\"hostname\":\"$(gp url 3000 | cut -d/ -f3)\",\"port\":\"443\",\"https\":true}}"
+  init: >
+    psql -h localhost -d postgres --file=support/docker/gitpod/setup_postgres.sql &&
+    yarn install --pure-lockfile
+  command: npm run dev
diff --git a/support/docker/gitpod/Dockerfile b/support/docker/gitpod/Dockerfile
index e18c392bf..1f9e80e3c 100644
--- a/support/docker/gitpod/Dockerfile
+++ b/support/docker/gitpod/Dockerfile
@@ -9,7 +9,3 @@ RUN sudo apt-get update -q && sudo apt-get install -qy \
  ffmpeg \
  openssl \
  redis-server
-
-# 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 && pg_stop