diff --git a/.gitpod.yml b/.gitpod.yml
index 1ea3f9bb1..8227cce68 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -13,7 +13,10 @@ ports:
 
 tasks:
   - name: Forem Server
-    before: redis-server &
+    before: >
+      redis-server &
+      gp await-port 5432 &&
+      sleep 1
     init: ./gitpod-init.sh
     command: bin/startup
   - name: Open Site