diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 0000000000..6634613b7e
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,13 @@
+FROM gitpod/workspace-full
+
+# Disable current PHP installation
+RUN sudo a2dismod php7.4
+RUN sudo a2dismod mpm_prefork
+
+# Install apache2 (PHP install requires to do this first)
+RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install apache2
+
+# Update to PHP 8.0 with unattended installation
+RUN sudo apt --yes install software-properties-common && sudo add-apt-repository ppa:ondrej/php -y
+RUN sudo apt update
+RUN sudo apt --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install php8.0
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 0000000000..811ee54ec8
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,18 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - init: docker-compose pull &&
+      docker-compose build &&
+      docker run --rm --interactive --tty --volume $PWD:/app composer update --ignore-platform-reqs --optimize-autoloader --no-plugins --no-scripts --prefer-dist
+    command: |
+      docker-compose up -d
+
+ports:
+  - port: 8080
+    onOpen: ignore
+    visibility: public
+
+vscode:
+  extensions:
+    - ms-azuretools.vscode-docker
diff --git a/docker-compose.yml b/docker-compose.yml
index c12ae93889..ec77a2ece5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,7 @@ services:
       - --accesslog=true
     ports:
       - 80:80
+      - 8080:80
       - 443:443
       - 9500:8080
     volumes: