diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 6634613b7e..a0a8e7a1f8 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,13 +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
+RUN sudo add-apt-repository ppa:ondrej/php -y
+# Disable current PHP installation
+RUN sudo a2dismod php7.4 mpm_prefork
+
+# Install apache2 (PHP install requires to do this first) and php8.0
+RUN sudo install-packages \
+    -o Dpkg::Options::="--force-confdef" \
+    -o Dpkg::Options::="--force-confold" \
+    apache2 php8.0
+
diff --git a/.gitpod.yml b/.gitpod.yml
index 32ccdb693f..c853781a99 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,9 +2,19 @@ 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
+  - name: Run Appwrite Docker Stack
+    init: |
+      docker-compose pull
+      docker-compose build
+    command: |
+      docker run --rm --interactive --tty \
+      --volume $PWD:/app \
+      composer update \
+      --ignore-platform-reqs \
+      --optimize-autoloader \
+      --no-plugins \
+      --no-scripts \
+      --prefer-dist
 
 ports:
   - port: 8080