diff --git a/Vagrant/logger_bootstrap.sh b/Vagrant/logger_bootstrap.sh
index b0a0ab5..95566fe 100644
--- a/Vagrant/logger_bootstrap.sh
+++ b/Vagrant/logger_bootstrap.sh
@@ -267,9 +267,9 @@ install_fleet_import_osquery_config() {
     echo -e "\n127.0.0.1       fleet" >>/etc/hosts
     echo -e "\n127.0.0.1       logger" >>/etc/hosts
 
-    # Set MySQL username and password, create kolide database
-    mysql -uroot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'kolide';"
-    mysql -uroot -pkolide -e "create database kolide;"
+    # Set MySQL username and password, create fleet database
+    mysql -uroot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'fleet';"
+    mysql -uroot -pfleet -e "create database fleet;"
 
     # Always download the latest release of Fleet
     curl -s https://api.github.com/repos/fleetdm/fleet/releases | grep 'https://github.com' | grep "/fleet.zip" | cut -d ':' -f 2,3 | tr -d '"' | tr -d ' '  | head -1 | wget --progress=bar:force -i -
@@ -278,7 +278,7 @@ install_fleet_import_osquery_config() {
     cp fleet/linux/fleet /usr/local/bin/fleet && chmod +x /usr/local/bin/fleet
 
     # Prepare the DB
-    fleet prepare db --mysql_address=127.0.0.1:3306 --mysql_database=kolide --mysql_username=root --mysql_password=kolide
+    fleet prepare db --mysql_address=127.0.0.1:3306 --mysql_database=fleet --mysql_username=root --mysql_password=fleet
 
     # Copy over the certs and service file
     cp /vagrant/resources/fleet/server.* /opt/fleet/
@@ -302,7 +302,7 @@ install_fleet_import_osquery_config() {
     fleetctl login --email admin@detectionlab.network --password 'admin123#'
 
     # Set the enrollment secret to match what we deploy to Windows hosts
-    mysql -uroot --password=kolide -e 'use kolide; update enroll_secrets set secret = "enrollmentsecret" where active=1;'
+    mysql -uroot --password=fleet -e 'use fleet; update enroll_secrets set secret = "enrollmentsecret";'
     echo "Updated enrollment secret"
 
     # Change the query invervals to reflect a lab environment
diff --git a/Vagrant/prepare.ps1 b/Vagrant/prepare.ps1
index c9de2ab..cdf46d6 100644
--- a/Vagrant/prepare.ps1
+++ b/Vagrant/prepare.ps1
@@ -121,7 +121,7 @@ function check_vmware_vagrant_plugin_installed {
   }
   else {
     Write-Host '  [!] VMware Workstation is installed, but the vagrant-vmware-desktop plugin is not.' -ForegroundColor red
-    Write-Host '  [-] Visit https://www.vagrantup.com/vmware/index.html#buy-now for more information on how to purchase ($80) and install it' -ForegroundColor yellow
+    Write-Host '  [-] Please install it via "vagrant plugin install vagrant-vmware-desktop"' -ForegroundColor yellow
     Write-Host '  [-] VMware Workstation will not be listed as a provider until the Vagrant plugin has been installed.' -ForegroundColor yellow
     Write-Host '  [-] NOTE: The plugin does not work with trial versions of VMware Workstation' -ForegroundColor yellow
     return $false
diff --git a/Vagrant/resources/fleet/fleet.service b/Vagrant/resources/fleet/fleet.service
index c1722ee..0facad3 100644
--- a/Vagrant/resources/fleet/fleet.service
+++ b/Vagrant/resources/fleet/fleet.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Kolide Fleet
+Description=fleet Fleet
 After=network.target
 
 [Service]
-ExecStart=/usr/local/bin/fleet serve --mysql_address=127.0.0.1:3306 --mysql_database=kolide --mysql_username=root --mysql_password=kolide --redis_address=127.0.0.1:6379  --server_cert=/opt/fleet/server.crt --server_key=/opt/fleet/server.key --logging_json --osquery_result_log_file=/var/log/fleet/osquery_result  --osquery_status_log_file=/var/log/fleet/osquery_status --auth_jwt_key=dasdsadasdjhshgfhdfb --server_address 0.0.0.0:8412 --osquery_enable_log_rotation
+ExecStart=/usr/local/bin/fleet serve --mysql_address=127.0.0.1:3306 --mysql_database=fleet --mysql_username=root --mysql_password=fleet --redis_address=127.0.0.1:6379  --server_cert=/opt/fleet/server.crt --server_key=/opt/fleet/server.key --logging_json --osquery_result_log_file=/var/log/fleet/osquery_result  --osquery_status_log_file=/var/log/fleet/osquery_status --server_address 0.0.0.0:8412 --osquery_enable_log_rotation
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ci/manual_machine_bootstrap.sh b/ci/manual_machine_bootstrap.sh
index bc3f939..70acb36 100644
--- a/ci/manual_machine_bootstrap.sh
+++ b/ci/manual_machine_bootstrap.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# This script is used to manually prepare an Ubuntu 16.04 server for DetectionLab building
+# This script is used to manually prepare an Ubuntu 18.04 server for DetectionLab building
 export DEBIAN_FRONTEND=noninteractive
 sed -i 's/archive.ubuntu.com/us.archive.ubuntu.com/g' /etc/apt/sources.list