diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -118,9 +118,11 @@ build:
 .PHONY: dev-sh
 ## make dev-sh
 dev-sh:
+	sudo echo "deb [trusted=yes] https://apt.fury.io/rsteube/ /" | sudo tee -a "/etc/apt/sources.list.d/fury.list"
 	sudo apt-get update
-	sudo apt-get install -y zsh
+	sudo apt-get install -y zsh carapace-bin
 	curl https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
+	echo "source <(carapace _carapace)" > /home/rhodecode/.zsrc
 	PROMPT='%(?.%F{green}√.%F{red}?%?)%f %B%F{240}%1~%f%b %# ' zsh
 
 .PHONY: dev-env