diff --git a/.gitpod.yml b/.gitpod.yml
index 33276b9..17c8e6b 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,5 +1,5 @@
 image:
-  file: gitpod/gitpod.Dockerfile
+  file: gitpod/debian.Dockerfile
 
 vscode:
   extensions:
diff --git a/gitpod/debian.Dockerfile b/gitpod/debian.Dockerfile
new file mode 100644
index 0000000..987d1b8
--- /dev/null
+++ b/gitpod/debian.Dockerfile
@@ -0,0 +1,19 @@
+FROM debian:latest
+
+# FIXME: Outputs `gitpod@ws-ce281d58-997b-44b8-9107-3f2da7feede3:/workspace/gitpod-tests1$` in terminal
+
+# To avoid bricked workspaces (https://github.com/gitpod-io/gitpod/issues/1171)
+ARG DEBIAN_FRONTEND=noninteractive
+
+USER root
+
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=C
+
+# Add 'gitpod' user
+RUN useradd \
+	--uid 33333 \
+	--create-home --home-dir /home/gitpod \
+	--shell /bin/bash \
+	--password gitpod \
+	gitpod || exit 1
\ No newline at end of file