diff --git a/gitpod/gitpod.Dockerfile b/gitpod/gitpod.Dockerfile
index 01f0ada..3dfc96d 100644
--- a/gitpod/gitpod.Dockerfile
+++ b/gitpod/gitpod.Dockerfile
@@ -1,19 +1,14 @@
 FROM gitpod/workspace-full-vnc:latest
 
-USER root
+USER gitpod
 
 # Update apt repositories
-RUN apt-get update
-
-# Upgrade the image
-RUN apt upgrade -y
-RUN apt dist-upgrade -y
-
-# Install linting dependencies
-RUN apt install -y shellcheck firefox tree xclip
-
-# Install mindmap dependencies
-RUN apt install -y umbrello
+RUN sudo apt-get update \
+    && sudo apt-get upgrade -y \
+    && sudo apt dist-upgrade -y \
+    && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y shellcheck firefox tree xclip umbrello \
+    && sudo rm -rf /var/lib/apt/lists/* \
+    && sudo apt autoremove -y
 
 # Add custom functions
 RUN if ! grep -qF 'ix()' /etc/bash.bashrc; then printf '%s\n' \
@@ -21,9 +16,3 @@ RUN if ! grep -qF 'ix()' /etc/bash.bashrc; then printf '%s\n' \
 	"ix() { curl -F 'f:1=<-' ix.io 2>/dev/null ;}" \
 	"xcopy() { xclip -se C ;}" \
 	>> /etc/bash.bashrc; fi
-
-# Remove apt sources to clean up space
-RUN rm -rf /var/lib/apt/lists/*
-
-# Clean-up unneeded packages
-RUN apt autoremove -y