diff --git a/.gitpod.yml b/.gitpod.yml
index 837842f32..af63be869 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,12 +1,19 @@
 tasks:
   - name: Init
-    init: pnpm install && docker-compose pull
-    command: cp .env.example .env && docker-compose up -d && pnpm run dev
+    init: |
+      pnpm install &&
+      docker-compose pull &&
+      cp .env.example .env &&
+      pnpm run build:server &&
+      node packages/server/build/commands.js system:migrate:latest
+    command: | 
+      docker-compose up -d &&
+      pnpm run dev
 
 ports:
   - port: 4000
     visibility: public
-    onOpen: open-browser
+    onOpen: open-preview
   - port: 3000
     visibility: public
     onOpen: ignore
diff --git a/packages/webapp/craco.config.js b/packages/webapp/craco.config.js
index c86d33ebc..4d444d065 100644
--- a/packages/webapp/craco.config.js
+++ b/packages/webapp/craco.config.js
@@ -11,4 +11,7 @@ module.exports = {
       },
     },
   },
+  devServer: {
+    allowedHosts: process.env.GITPOD_HOST ? 'all' : 'auto'
+  },
 };