diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile
index 50fe4487d9..055355aefa 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile
@@ -1,11 +1,25 @@
-if Vagrant::VERSION < "1.2.3"
-  raise "Need at least vagrant version 1.2.3, please update"
+# -*- mode: ruby -*-
+# # vi: set ft=ruby :
+
+if Vagrant::VERSION < "1.5.0"
+  raise "Need at least vagrant version 1.5.0, please update"
 end
 
+require_relative 'override-plugin.rb'
+
 Vagrant.configure("2") do |config|
   # SSH in as the default 'core' user, it has the vagrant ssh key.
   config.ssh.username = "core"
 
   # Disable the base shared folder, guest additions are unavailable.
   config.vm.synced_folder ".", "/vagrant", disabled: true
+
+  config.vm.provider :virtualbox do |vb|
+    # Guest Additions are unavailable.
+    vb.check_guest_additions = false
+
+    # Fix docker not being able to resolve private registry in VirtualBox
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+  end
 end
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/override-plugin.rb b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/override-plugin.rb
new file mode 100644
index 0000000000..eb0bc99589
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/override-plugin.rb
@@ -0,0 +1,117 @@
+# -*- mode: ruby -*-
+# # vi: set ft=ruby :
+
+# NOTE: This monkey-patching of the coreos guest plugin is a terrible
+# hack that needs to be removed once the upstream plugin works with
+# alpha CoreOS images.
+
+require 'tempfile'
+require 'ipaddr'
+require Vagrant.source_root.join("plugins/guests/coreos/cap/configure_networks.rb")
+
+BASE_CLOUD_CONFIG = <<EOF
+#cloud-config
+
+coreos:
+    units:
+      - name: coreos-cloudinit-vagrant-user.path
+        command: start
+        runtime: no
+        content: |
+          [Path]
+          PathExists=/var/lib/coreos-vagrant/vagrantfile-user-data
+      - name: coreos-cloudinit-vagrant-user.service
+        runtime: no
+        content: |
+          [Unit]
+          ConditionFileNotEmpty=/var/lib/coreos-vagrant/vagrantfile-user-data
+
+          [Service]
+          Type=oneshot
+          EnvironmentFile=/etc/environment
+          ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/vagrantfile-user-data
+          RemainAfterExit=yes
+EOF
+
+NETWORK_UNIT = <<EOF
+      - name: %s
+        runtime: no
+        content: |
+          [Match]
+          Name=%s
+
+          [Network]
+          Address=%s
+EOF
+
+# Borrowed from http://stackoverflow.com/questions/1825928/netmask-to-cidr-in-ruby
+IPAddr.class_eval do
+  def to_cidr
+    self.to_i.to_s(2).count("1")
+  end
+end
+
+module VagrantPlugins
+  module GuestCoreOS
+    module Cap
+      class ConfigureNetworks
+        include Vagrant::Util
+
+        def self.configure_networks(machine, networks)
+          cfg = BASE_CLOUD_CONFIG
+          machine.communicate.tap do |comm|
+
+            # Read network interface names
+            interfaces = []
+            comm.sudo("ifconfig | grep enp0 | cut -f1 -d:") do |_, result|
+              interfaces = result.split("\n")
+            end
+
+            ip = ""
+
+            # Configure interfaces
+            # FIXME: fix matching of interfaces with IP adresses
+            networks.each do |network|
+              iface_num = network[:interface].to_i
+              iface_name = interfaces[iface_num]
+              cidr = IPAddr.new('255.255.255.0').to_cidr
+              address = "%s/%s" % [network[:ip], cidr]
+              unit_name = "50-%s.network" % [iface_name]
+              unit = NETWORK_UNIT % [unit_name, iface_name, address]
+
+              cfg = "#{cfg}#{unit}"
+              ip = network[:ip]
+            end
+
+            cfg = <<EOF
+#{cfg}
+write_files:
+  - path: /etc/environment
+    content: |
+      COREOS_PUBLIC_IPV4=#{ip}
+      COREOS_PRIVATE_IPV4=#{ip}
+
+hostname: #{machine.name}
+EOF
+
+            temp = Tempfile.new("coreos-vagrant")
+            temp.binmode
+            temp.write(cfg)
+            temp.close
+
+            comm.upload(temp.path, "/tmp/user-data")
+            comm.sudo("mkdir -p /var/lib/coreos-vagrant")
+            comm.sudo("mv /tmp/user-data /var/lib/coreos-vagrant/")
+
+          end
+        end
+      end
+
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          # This is handled in configure_networks
+        end
+      end
+    end
+  end
+end