diff --git a/Vagrantfile b/Vagrantfile
index 42388e4..fc1e459 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,10 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+require 'yaml'
+
+settings = YAML.load_file 'settings.vagrant.yaml'
+
 Vagrant.configure(2) do |config|
 
   if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
@@ -10,9 +14,17 @@
     Provider = "virtualbox"
   elsif RUBY_PLATFORM =~ /linux/
     puts("Configuring for linux")
-    config.vm.synced_folder "../..", "/cord", type: "nfs"
-    Box = "ubuntu1604"
-    Provider = "libvirt"
+    if settings['vProvider'] == "virtualbox"
+      puts("Using the virtualbox configuration");
+      config.vm.synced_folder "../..", "/cord"
+      Box = "ubuntu/xenial64"
+      Provider = "virtualbox"
+    else
+      puts("Using the QEMU/KVM configuration");
+      config.vm.synced_folder "../..", "/cord", type: "nfs"
+      Box = "ubuntu1604"
+      Provider = "libvirt"
+    end
   else
     puts("Configuring for other")
     config.vm.synced_folder "../..", "/cord"
diff --git a/settings.vagrant.yaml b/settings.vagrant.yaml
new file mode 100644
index 0000000..8019610
--- /dev/null
+++ b/settings.vagrant.yaml
@@ -0,0 +1,5 @@
+---
+# Use virtualbox for development
+vProvider: "virtualbox"
+# Use KVM for production
+#vProvider: "KVM"