diff --git a/gitpod/gitpod.Dockerfile b/gitpod/gitpod.Dockerfile
index 0ea80db..4ca1159 100644
--- a/gitpod/gitpod.Dockerfile
+++ b/gitpod/gitpod.Dockerfile
@@ -13,7 +13,10 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
     && apt-get upgrade -y \
     && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - \
     && apt dist-upgrade -y \
-    && apt-get install -y clang valgrind shellcheck docker-ce docker-ce-cli containerd.io firefox tree xclip umbrello gnuplot fish \
+    && apt-get install -y clang valgrind shellcheck docker-ce docker-ce-cli containerd.io firefox tree xclip umbrello gnuplot fish zsh \
+    && sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+    && curl -L https://get.oh-my.fish | fish
+    && git clone --depth=1 https://github.com/Bash-it/bash-it.git ~/.bash_it
     && rm -rf /var/lib/apt/lists/* \
     && apt autoremove -y
 
@@ -29,7 +32,4 @@ RUN if ! grep -qF 'ix()' /etc/bash.bashrc; then printf '%s\n' \
 	'# Custom' \
 	"ix() { curl -F 'f:1=<-' ix.io 2>/dev/null ;}" \
 	"xcopy() { xclip -se C ;}" \
-	>> /etc/bash.bashrc; fi
-
-# Change shell
-ENV SHELL=/usr/bin/fish
\ No newline at end of file
+	>> /etc/bash.bashrc; fi
\ No newline at end of file