diff --git a/bootstrap.sh b/bootstrap.sh
index 26701a5..11aeeef 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -393,14 +393,14 @@ function stepInstallNeoVim() {
     if ! [ -e "$(command -v nvim)" ]; then
         logStep "Installing NeoVim..."
         # Adds repo for latest neovim version
-        runCmdAndLog add-apt-repository -y ppa:neovim-ppa/stable
+        runCmdAndLog add-apt-repository -y ppa:neovim-ppa/unstable
         runCmdAndLog ${APT_CMD} update
         runCmdAndLog ${APT_INSTALL} neovim
         # Set neovim as default vim
         local NVIM_BIN
         NVIM_BIN="$(command -v nvim)"
-        runCmdAndLog update-alternatives --set vi "${NVIM_BIN}"
-        runCmdAndLog update-alternatives --set vim "${NVIM_BIN}"
+        runCmdAndLog update-alternatives --install /usr/bin/vi vi "${NVIM_BIN}" 110
+        runCmdAndLog update-alternatives --install /usr/bin/vim vim "${NVIM_BIN}" 110
         log "NeoVim installed."
     else
         logStep "NeoVim already installed."