diff --git a/mesos-dev/Dockerfile b/mesos-dev/Dockerfile
index ded362f..a586ac1 100644
--- a/mesos-dev/Dockerfile
+++ b/mesos-dev/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y \
 	ca-certificates \
 	curl \
 	g++ \
+	iptables \
 	libapr1-dev \
 	libcurl4-openssl-dev \
 	libpython-dev \
@@ -26,6 +27,11 @@ RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
+ADD https://get.docker.com/builds/Linux/x86_64/docker-latest /usr/bin/docker
+
+RUN chmod +x /usr/bin/docker \
+	&& echo "docker daemon -D -s overlay" > $HOME/.bash_history
+
 WORKDIR /usr/src/mesos
 
 ENTRYPOINT [ "bash" ]
diff --git a/vagrant/Dockerfile b/vagrant/Dockerfile
index 40b7cd6..699ed6e 100644
--- a/vagrant/Dockerfile
+++ b/vagrant/Dockerfile
@@ -1,14 +1,24 @@
-# Base docker image
-FROM jess/virtualbox:latest
+FROM debian:sid
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-ENV	VERSION 1.7.4
-
-ADD	https://dl.bintray.com/mitchellh/vagrant/vagrant_${VERSION}_x86_64.deb /src/vagrant_${VERSION}_x86_64.deb 
-
-# Install Vagrant
-RUN	apt-get update \
-	&& dpkg -i /src/vagrant_${VERSION}_x86_64.deb \
+RUN	apt-get update && apt-get install -y \
+	gcc \
+	libxslt-dev \
+	libxml2-dev \
+	libvirt-dev \
+	make \
+	pkg-config \
+	ruby-dev \
+	zlib1g-dev \
+	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
+ENV	VAGRANT_VERSION 1.8.1
+
+ADD	https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb /src/vagrant_${VAGRANT_VERSION}_x86_64.deb
+
+# install vagrant and the libvirt plugin
+RUN dpkg -i /src/vagrant_${VAGRANT_VERSION}_x86_64.deb \
+	&& vagrant plugin install vagrant-libvirt
+
 ENTRYPOINT [ "vagrant" ]