diff --git a/dotfiles b/dotfiles
index 18b0323..fbd2fc6 100755
--- a/dotfiles
+++ b/dotfiles
@@ -30,15 +30,9 @@ case $1 in
     ;;
 
     install-server)
-        sudo apt install python3 neovim neofetch docker -y
+        sudo apt install python3 neovim neofetch cmake curl -y
 
         $ROOT/install -c "$DOTFILES/install-server.yaml"
-
-        $ROOT/scripts/install-zsh
-
-        $ROOT/scripts/chuser
-
-        $ROOT/scripts/install-vim
     ;;
 
     *)
diff --git a/install-server.yaml b/install-server.yaml
index f8558de..76a71d1 100644
--- a/install-server.yaml
+++ b/install-server.yaml
@@ -12,6 +12,10 @@
 
 - shell:
     - [git submodule update --init --recursive, Installing submodules]
+    - [scripts/install-zsh, Installing zsh]
+    - [scripts/chuser, Update shell]
+    - [scripts/install-vim, Install NeoVim and plugins]
+    - [curl -fsSL https://get.docker.com | sh, Install Docker]
 
 - create:
     - ~/.config