diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index a0bef6c2..d260df94 100755
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -5,6 +5,7 @@ WEB_NAME="disroot.lan"
 WEB_ROOT="/var/www/"
 WWW_USER="www-data"
 YAML="/var/www/disroot.lan/user/config/system.yaml"
+GRAV_VERSION="1.6.18"
 
 # Provisioning actions
 apt install dialog
@@ -17,7 +18,9 @@ sudo debconf-set-selections <<< "postfix postfix/mailname string ${WEB_NAME}"
 sudo apt-get -y update
 sudo apt-get -y upgrade
 sudo apt-get -y install ca-certificates apt-transport-https
-echo "deb https://packages.sury.org/php/ buster main" | sudo tee -a /etc/apt/sources.list.d/php.list
+if ! grep -q "^deb .*sury" /etc/apt/sources.list /etc/apt/sources.list.d/*; then
+    echo "deb https://packages.sury.org/php/ buster main" | sudo tee -a /etc/apt/sources.list.d/php.list
+fi
 
 # Sury Key for PHP7.4
 wget -q https://packages.sury.org/php/apt.gpg -O- | sudo apt-key add -
@@ -33,28 +36,52 @@ echo "Installing php7..."
 sudo apt-get install -y php7.4-zip php7.4-cli php7.4-curl php7.4-gd php7.4-mbstring php7.4-xml php7.4-fpm
 
 # Create the Nginx config files and restart webserver
+echo "Installing Nginx config files..."
 sudo rsync -cr /vagrant/provision/etc/nginx/sites-available /etc/nginx/
 sudo ln -s /etc/nginx/sites-available/"${WEB_NAME}".conf /etc/nginx/sites-enabled/"${WEB_NAME}".conf
 sudo rm /etc/nginx/sites-enabled/default
 sudo service nginx restart
 
 # Install GRAV in webroot
-sudo chown -R ${WWW_USER}:${WWW_USER} /var/www
-sudo wget https://getcomposer.org/download/1.9.1/composer.phar -O /usr/local/bin/composer && sudo chmod 755 /usr/local/bin/composer
-echo "Git"
-git clone -b master https://github.com/getgrav/grav.git "${WEB_ROOT}""${WEB_NAME}"
+echo "Installing GRAV..."
 sudo chown -R ${WWW_USER}:${WWW_USER} "${WEB_ROOT}"
 
-echo "enter git"
-cd "${WEB_ROOT}""${WEB_NAME}"
-echo "composer"
-sudo -u "${WWW_USER}" composer install --no-dev -o
-sudo chown -R ${WWW_USER}:${WWW_USER} "${WEB_ROOT}"
-sudo chmod 775 -R bin/
-sudo -u "${WWW_USER}" bin/grav install
+if [ ! -f "${WEB_ROOT}""${WEB_NAME}" ]; then
+   sudo -u "${WWW_USER}" mkdir "${WEB_ROOT}""${WEB_NAME}"
+fi
+
+## Specific version
+FILE="${WEB_ROOT}"grav-v"${GRAV_VERSION}".zip
+if [ ! -f "$FILE" ]; then
+  echo "Downloading grav-v"${GRAV_VERSION}".zip"
+  sudo -u "${WWW_USER}" wget https://github.com/getgrav/grav/releases/download/"${GRAV_VERSION}"/grav-v"${GRAV_VERSION}".zip -P "${WEB_ROOT}"
+  sudo -u "${WWW_USER}" unzip -o "${WEB_ROOT}"grav-v"${GRAV_VERSION}".zip -d "${WEB_ROOT}"
+  sudo -u "${WWW_USER}" cp -r "${WEB_ROOT}"grav/* "${WEB_ROOT}""${WEB_NAME}"
+else
+  echo "grav-v"${GRAV_VERSION}".zip already exists"
+fi
+
+# Directly from Master
+# if [ ! -f /usr/local/bin/composer ]; then
+#     sudo wget https://getcomposer.org/download/1.9.1/composer.phar -O /usr/local/bin/composer && sudo chmod 755 /usr/local/bin/composer
+# fi
+# echo "Git"
+# git clone -b master https://github.com/getgrav/grav.git "${WEB_ROOT}""${WEB_NAME}"
+# sudo chown -R ${WWW_USER}:${WWW_USER} "${WEB_ROOT}"
+# echo "enter git"
+# cd "${WEB_ROOT}""${WEB_NAME}"
+# echo "composer"
+# sudo -u "${WWW_USER}" composer install --no-dev -o
+# sudo chown -R ${WWW_USER}:${WWW_USER} "${WEB_ROOT}"
+# sudo chmod 775 -R bin/
+# sudo -u "${WWW_USER}" bin/grav install
+
 #sudo -u "${WWW_USER}" bin/gpm install disroot
 #sudo -u "${WWW_USER}" bin/gpm install language-selector -> Disabled as we're using grav-plugin-language-selector Disroot repo
 
+echo "Enter git"
+cd "${WEB_ROOT}""${WEB_NAME}"
+
 sudo -u "${WWW_USER}" bin/gpm install themer
 # https://github.com/sommerregen/grav-plugin-themer
 
@@ -97,27 +124,26 @@ if ! grep -q redirect_default_route "${YAML}" ; then
     sudo -u "${WWW_USER}" ex -s -c '16i|  redirect_default_route: true' -c x "${YAML}"
 fi
 
-sudo -u "${WWW_USER}" -i 's/false/true/g' "${YAML}"
-
+sudo -u "${WWW_USER}" -i 's/false/true/g' "${YAML}" # sed is missing, but creates an error anyway as "markdown: extra: true" gives an error
 
 # Add website domain to local /etc/hosts file
 sudo sed -i "s/127.0.0.1\tlocalhost/127.0.0.1\tlocalhost $WEB_NAME/" /etc/hosts
 
-#Add website pages in GRAV
+# Add website pages in GRAV
 sudo mount -o bind /var/www/pages "${WEB_ROOT}""${WEB_NAME}"/user/pages
 chown "${WWW_USER}":"${WWW_USER}" -R "${WEB_ROOT}""${WEB_NAME}"/user/pages
 
-#Add Privacy Statement pages in GRAV
+# Add Privacy Statement pages in GRAV
 sudo mount -o bind /var/www/pages/privacy_policy/_pp "${WEB_ROOT}""${WEB_NAME}"/user/pages/privacy_policy/_pp
 chown "${WWW_USER}":"${WWW_USER}" -R "${WEB_ROOT}""${WEB_NAME}"/user/pages/privacy_policy/_pp
 
-#Add Disroot theme  in GRAV
+# Add Disroot theme in GRAV
 sudo -u "${WWW_USER}" ln -s "${WEB_ROOT}"/grav-theme-disroot "${WEB_ROOT}""${WEB_NAME}"/user/themes/disroot
 
-#Add Disroot Blog theme in GRAV
+# Add Disroot Blog theme in GRAV
 sudo -u "${WWW_USER}" ln -s "${WEB_ROOT}"/grav-theme-disrootblog "${WEB_ROOT}""${WEB_NAME}"/user/themes/disrootblog
 
-#Add language-selector in GRAV
+# Add language-selector in GRAV
 sudo -u "${WWW_USER}" ln -s "${WEB_ROOT}"/grav-plugin-language-selector "${WEB_ROOT}""${WEB_NAME}"/user/plugins/language-selector
 
 exit 0