diff --git a/Vagrantfile b/Vagrantfile
index 325dba8c3..bbae69b8c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -18,25 +18,19 @@ end
 CONF = _config
 MOUNT_POINT = '/home/vagrant/kitsune'
 
-Vagrant::Config.run do |config|
-    config.vm.box = "ubuntu-14.04"
-    config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/ubuntu-14.04-amd64-vbox.box"
+Vagrant.configure(2) do |config|
+    config.vm.box = "ubuntu/trusty64"
 
-    Vagrant.configure("1") do |config|
-        config.vm.customize ["modifyvm", :id, "--memory", CONF['memory']]
+    config.vm.network "forwarded_port", guest:8000, host:8000
+
+    config.vm.network "private_network", ip: "33.33.33.77"
+
+    config.vm.synced_folder ".", "/vagrant", disabled: true
+    config.vm.synced_folder ".", MOUNT_POINT
+
+    config.vm.provider "virtualbox" do |vb|
+        vb.memory = CONF['memory']
     end
 
-    Vagrant.configure("2") do |config|
-        config.vm.provider "virtualbox" do |v|
-          v.name = "KITSUNE_VM"
-          v.customize ["modifyvm", :id, "--memory", CONF['memory']]
-        end
-    end
-
-    config.vm.network :hostonly, "33.33.33.77"
-    config.vm.forward_port 8000, 8000
-
-    config.vm.share_folder("vagrant-root", MOUNT_POINT, ".")
     config.vm.provision "shell", path: "bin/vagrant_provision.sh"
 end
-
diff --git a/vagrantconfig.yaml b/vagrantconfig.yaml
index 35c275004..b4d0d2871 100644
--- a/vagrantconfig.yaml
+++ b/vagrantconfig.yaml
@@ -3,7 +3,7 @@
 # Don't change this; use vagrantconfig_local.yaml to override these
 # settings instead.
 
-memory: 256
+memory: 1024
 
 # enable this to see verbose and debug puppet output
 debug_mode: false
diff --git a/vagrantconfig_local.yaml b/vagrantconfig_local.yaml
index 8259b6618..815b70c9d 100644
--- a/vagrantconfig_local.yaml
+++ b/vagrantconfig_local.yaml
@@ -2,7 +2,7 @@
 
 # Don't change this; copy this to vagrantconfig_local.yaml, and change that instead.
 
-#memory: 256
+#memory: 1024
 
 # set this to "gui" if vagrant cannot connect
 #boot_mode: gui