diff --git a/.gitpod.yml b/.gitpod.yml
index 3330a5b0d40..894068fe882 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -4,9 +4,12 @@ tasks:
     command: echo 'start script'
   - name: Install OpenMage
     init: |
-      BASE_URL="$(echo "$GITPOD_WORKSPACE_URL" | sed s~https://~https://8000-~)"
-      HOST_PORT=8000 BASE_URL=$BASE_URL bash dev/gitpod/install.sh
-    command: docker ps
+      cd dev/gitpod
+      echo "# Generated by .gitpod.yml - edit as needed" > .env
+      echo "HOST_NAME=8000-$GITPOD_WORKSPACE_ID.$GITPOD_WORKSPACE_CLUSTER_HOST" >> .env
+      echo "HOST_PORT=8000" >> .env
+      echo "BASE_URL=https://8000-$GITPOD_WORKSPACE_ID.$GITPOD_WORKSPACE_CLUSTER_HOST/" >> .env
+    command: bash dev/gitpod/install.sh
     openMode: tab-after
   - name: prepare git
     init: git config core.fileMode false
diff --git a/dev/gitpod/docker-compose.yml b/dev/gitpod/docker-compose.yml
index 9261658b449..dac7295f155 100644
--- a/dev/gitpod/docker-compose.yml
+++ b/dev/gitpod/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   apache:
-    image: openmage/php-dev:7.4-apache
+    image: ghcr.io/colinmollenhour/docker-openmage:8.2-apache
     hostname: ${HOST_NAME:-openmage-7f000001.nip.io}
     user: "33333:33333"
     ports:
@@ -10,8 +10,8 @@ services:
     volumes:
       - ../..:/var/www/html
     environment:
-      - ENABLE_SENDMAIL=true
-      - XDEBUG_CONFIG=remote_connect_back=1 remote_enable=1 idekey=phpstorm
+      - ENABLE_SENDMAIL=false
+      - XDEBUG_CONFIG=
       - MAGE_IS_DEVELOPER_MODE=1
     links:
       - mysql