diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index 3d549d99ea9..03d11d6acb2 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -1,10 +1,17 @@
-FROM gitpod/workspace-full-vnc:latest
-
-RUN dpkg --add-architecture i386
-RUN apt-get update && apt-get -y install cabextract libxext6 libxext6:i386 libfreetype6 libfreetype6:i386
+FROM gitpod/workspace-full-vnc:branch-pr-349
 
+USER root
+RUN dpkg --add-architecture i386 \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends -o APT::Immediate-Configure=0 \
+    cabextract=1.* \
+    libxext6=2* \
+    libxext6:i386 \
+    libfreetype6=2.10* \
+    libfreetype6:i386=2.10* \
+    fakeroot=1.24* \
+&& apt-get clean && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
 
 USER gitpod
-
 # activate java 11. It's already installed in the base image.
 RUN  bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install java"
diff --git a/.gitpod.yml b/.gitpod.yml
index 0721eb19d0f..0d3d72ca35c 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -11,5 +11,6 @@ tasks:
 - init: >
     mvn install
   command: >
-    cd phoenicis-javafx/ &&
-    mvn exec:java
+    mvn clean package &&
+    cd phoenicis-dist/src/scripts &&
+    sh phoenicis-create-package.sh