diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 091facb..be00a15 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,10 +1,21 @@
-FROM berkus/docker-rusty-ci
-                    
+FROM gitpod/workspace-full
+
 USER gitpod
 
-# Install custom tools, runtime, etc. using apt-get
-# For example, the command below would install "bastet" - a command line tetris clone:
-#
-# RUN sudo apt-get -q update && #     sudo apt-get install -yq bastet && #     sudo rm -rf /var/lib/apt/lists/*
-#
-# More information: https://www.gitpod.io/docs/config-docker/
+RUN sudo apt-get update \
+    && sudo apt-get install -y --no-install-recommends \
+        pkg-config \
+        libpython3.6 \
+        rust-lldb \
+        qemu \
+        gdb \
+    && .cargo/bin/rustup target add aarch64-linux-android \
+    && .cargo/bin/rustup component add clippy llvm-tools-preview rls rust-analysis rustfmt rust-src \
+    && .cargo/bin/cargo install cargo-bloat cargo-asm cargo-expand cargo-graph \
+        cargo-binutils cargo-geiger cargo-cache cargo-make just \
+    && .cargo/bin/cargo cache -i \
+    && .cargo/bin/cargo cache -e \
+    && .cargo/bin/cargo cache -i \
+    && sudo rm -rf /var/lib/apt/lists/*
+
+ENV RUST_LLDB=/usr/bin/lldb-8
diff --git a/.gitpod.yml b/.gitpod.yml
index 40f8cfc..f703702 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,5 +1,21 @@
-tasks:
-  - init: cargo build
-    command: cargo watch -x run
 image:
   file: .gitpod.Dockerfile
+
+github:
+  prebuilds:
+    master: true
+    branches: true
+    pullRequests: true
+    addCheck: false
+    addComment: true
+    addBadge: true
+    addLabel: prebuilt-in-gitpod
+
+vscode:
+  extensions:
+    - hbenl.vscode-test-explorer@2.15.0:koqDUMWDPJzELp/hdS/lWw==
+    - Swellaby.vscode-rust-test-adapter@0.11.0:Xg+YeZZQiVpVUsIkH+uiiw==
+    - serayuzgur.crates@0.4.7:HMkoguLcXp9M3ud7ac3eIw==
+    - belfz.search-crates-io@1.2.1:kSLnyrOhXtYPjQpKnMr4eQ==
+    - bungcip.better-toml@0.3.2:3QfgGxxYtGHfJKQU7H0nEw==
+    - webfreak.debug@0.24.0:1zVcRsAhewYEX3/A9xjMNw==