diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index aca6c595..9043f06a 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -1 +1,3 @@
-FROM gitpod/workspace-postgresql
\ No newline at end of file
+FROM gitpod/workspace-postgresql
+
+RUN pg_start
\ No newline at end of file
diff --git a/.gitpod.yml b/.gitpod.yml
index 1505fa34..5936e530 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,27 +1,33 @@
 tasks:
-  - name: Restore .env file
+  - name: Restore .env file, or create a new one
     command: |
       if [ -f .env ]; then
-        # If this workspace already has a .env, don't override it
-        # Local changes survive a workspace being opened and closed
-        # but they will not persist between separate workspaces for the same repo
         echo "Found .env in workspace"
       else
         if [ -z "${DOTENV}" ]; then
-          # There is no $DOTENV from a previous workspace
-          # Default to the example .env
           echo "Setting example .env"
-          cp .env.example .env
+          cp .env.gitpod .env
         else
-          # After making changes to .env, run this line to persist it to $DOTENV
-          #   gp env DOTENV="$(base64 .env | tr -d '\n')"
-          #
-          # Environment variables set this way are shared between all your workspaces for this repo
-          # The lines below will read $DOTENV and print a .env file
           echo "Restoring .env from Gitpod"
           echo "${DOTENV}" | base64 -d > .env
         fi
       fi
 
-  - init: pnpm install
+  - name: Set up dependencies, and run the development server
+    init: pnpm install
     command: pnpm dev
+
+ports:
+  # PostgreSQL
+  - port: 5432
+    visibility: private
+
+  # Client
+  - port: 3100
+    visibility: public
+    onOpen: ignore
+
+  # Client
+  - port: 3000
+    visibility: public
+    onOpen: open-browser