diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index 71b126b..66e2e16 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -1,36 +1,12 @@
 FROM gitpod/workspace-full:latest
 
-ENV ANDROID_HOME=/home/gitpod/android-sdk \
-    FLUTTER_HOME=/home/gitpod/flutter
+ENV ANDROID_HOME=/workspace/android-sdk \
+    FLUTTER_ROOT=/workspace/flutter \
+    FLUTTER_HOME=/workspace/flutter
 
 USER root
 
-RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list && \
-    apt-get update && \
+RUN apt-get update && \
     apt-get -y install build-essential libkrb5-dev gcc make gradle openjdk-8-jdk && \
     apt-get clean && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*;
-    
-USER gitpod
-
-RUN cd /home/gitpod && \
-    wget -qO flutter_sdk.tar.xz \
-    https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.9.1+hotfix.4-stable.tar.xz && \
-    tar -xvf flutter_sdk.tar.xz && \
-    rm -f flutter_sdk.tar.xz
-    
-RUN cd /home/gitpod && \
-    wget -qO android_studio.zip \
-    https://dl.google.com/dl/android/studio/ide-zips/3.3.0.20/android-studio-ide-182.5199772-linux.zip && \
-    unzip android_studio.zip && \
-    rm -f android_studio.zip
-
-RUN mkdir -p /home/gitpod/android-sdk && \
-    cd /home/gitpod/android-sdk && \
-    wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
-    unzip sdk-tools-linux-4333796.zip && \
-    rm -f sdk-tools-linux-4333796.zip
-
+    apt-get -y autoremove
\ No newline at end of file
diff --git a/.gitpod.yml b/.gitpod.yml
index fc2a98d..69f7084 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,15 +2,25 @@ image:
   file: .gitpod.dockerfile
 
 tasks:
-- command: |
+- before: |
+    export PATH=$FLUTTER_HOME/bin:$ANDROID_HOME/bin:$ANDROID_HOME/platform-tools:$PATH
     mkdir -p /home/gitpod/.android
     touch /home/gitpod/.android/repositories.cfg
-    export PATH=$FLUTTER_HOME/bin:$ANDROID_HOME/bin:$ANDROID_HOME/platform-tools:$PATH
-    /home/gitpod/android-sdk/tools/bin/sdkmanager "platform-tools" "platforms;android-28" "build-tools;28.0.3"
+  init: |
+    echo "Installing Flutter SDK..."
+    cd /workspace && wget -qO flutter_sdk.tar.xz https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.9.1+hotfix.4-stable.tar.xz && tar -xf flutter_sdk.tar.xz && rm -f flutter_sdk.tar.xz
+    echo "Installing Android SDK..."
+    mkdir -p /workspace/android-sdk && cd /workspace/android-sdk && wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && unzip sdk-tools-linux-4333796.zip && rm -f sdk-tools-linux-4333796.zip
+    /workspace/android-sdk/tools/bin/sdkmanager "platform-tools" "platforms;android-28" "build-tools;28.0.3"
+    echo "Init Flutter..."
+    cd /workspace/ha_client
+    flutter upgrade
     flutter doctor --android-licenses
     flutter pub get
+  command: |
     flutter pub upgrade
     echo "Ready to go!"
+    flutter doctor
 vscode:
   extensions:
     - Dart-Code.dart-code@3.5.0-beta.1:Wg2nTABftVR/Dry4tqeY1w==