diff --git a/install/README.md b/install/README.md
index 404394f8a..de0996e12 100644
--- a/install/README.md
+++ b/install/README.md
@@ -88,7 +88,7 @@ The default VM login details are:
 - MySQL 5.7.15
 - Apache 2.4.18
 - Tomcat 7.0.68.0
-- Solr 4.10.3
+- Solr 6.2.1
 - Camel 2.15.1
 - Fedora 4.6.0
 - Fedora Camel Component 4.4.0
diff --git a/install/Vagrantfile b/install/Vagrantfile
index 81e5301b4..a450052be 100644
--- a/install/Vagrantfile
+++ b/install/Vagrantfile
@@ -47,6 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network :forwarded_port, guest: 3306, host: 3306 # MySQL
   config.vm.network :forwarded_port, guest: 5432, host: 5432 # PostgreSQL
   config.vm.network :forwarded_port, guest: 8383, host: 8383 # Loris
+  config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr
 
   config.vm.provider "virtualbox" do |vb|
     vb.customize ["modifyvm", :id, "--memory", $memory]
diff --git a/install/configs/variables b/install/configs/variables
index 565c82637..21566a195 100755
--- a/install/configs/variables
+++ b/install/configs/variables
@@ -8,8 +8,7 @@ KARAF_DIR="/opt/karaf"
 KARAF_CLIENT="$KARAF_DIR/bin/client"
 KARAF_CONFIGS="$HOME_DIR/islandora/install/configs/karaf/"
 CAMEL_VERSION=4.4.0
-SOLR_VERSION=4.10.3
-SOLR_HOME="/var/lib/tomcat7/solr"
+SOLR_VERSION=6.2.1
 BLAZEGRAPH_VERSION=2.1.4
 DRUPAL_HOME="/var/www/html/drupal"
 DRUPAL_VERSION=8.2.2
diff --git a/install/scripts/solr.sh b/install/scripts/solr.sh
index 55d9a754f..57bde63c5 100644
--- a/install/scripts/solr.sh
+++ b/install/scripts/solr.sh
@@ -13,32 +13,9 @@ if [ ! -f "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" ]; then
   wget -q -O "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" "http://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
 fi
 
-# Prepare SOLR_HOME
-if [ ! -d "$SOLR_HOME" ]; then
-  mkdir "$SOLR_HOME"
-fi
-
 cp -v "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" /tmp
 cd /tmp
-tar -xzf solr-"$SOLR_VERSION".tgz
-cp "solr-$SOLR_VERSION/dist/solr-$SOLR_VERSION.war" /var/lib/tomcat7/webapps/solr.war
-chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/solr.war
-
-if [ ! -f "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" ]; then
-  echo "Downloading commons-logging-1.1.2.jar"
-  wget -q -O "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" "http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.2/commons-logging-1.1.2.jar"
-fi
-cp "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" /usr/share/tomcat7/lib
-cp /tmp/solr-"$SOLR_VERSION"/example/lib/ext/slf4j* /usr/share/tomcat7/lib
-cp /tmp/solr-"$SOLR_VERSION"/example/lib/ext/log4j* /usr/share/tomcat7/lib
-
-chown -hR tomcat7:tomcat7 /usr/share/tomcat7/lib
-
-cp -R /tmp/solr-"$SOLR_VERSION"/example/solr/* "$SOLR_HOME"
-
-chown -hR tomcat7:tomcat7 "$SOLR_HOME"
-
-touch /var/lib/tomcat7/velocity.log
-chown tomcat7:tomcat7 /var/lib/tomcat7/velocity.log
-
-service tomcat7 restart
+tar xzf solr-"$SOLR_VERSION".tgz solr-"$SOLR_VERSION"/bin/install_solr_service.sh --strip-components=2
+bash ./install_solr_service.sh solr-"$SOLR_VERSION".tgz
+cd /opt/solr
+sudo -u solr bin/solr create_core -c CLAW