diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..582702821
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y \
+    wget patch cpio python unzip rsync bc bzip2 ncurses-dev git make g++ python-matplotlib python-numpy
+
+ARG BUILDROOT_VERSION=2017.11.2
+ARG BUILDROOT_BOARD=vm
+
+# Get buildroot
+WORKDIR /buildroot
+RUN wget https://buildroot.org/downloads/buildroot-${BUILDROOT_VERSION}.tar.gz \
+    tar xvzf buildroot-${BUILDROOT_VERSION}.tar.gz
+
+# Download all the required files
+COPY $BUILDROOT_BOARD/buildroot.config /buildroot/buildroot-$BUILDROOT_VERSION/.config
+COPY $BUILDROOT_BOARD/linux.config /buildroot/buildroot-$BUILDROOT_VERSION/linux.config
+WORKDIR /buildroot/buildroot-$BUILDROOT_VERSION
+RUN make source
+
+# CMD /buildroot/buildroot-$BUILDROOT_VERSION/make
diff --git a/Dockerfile.vm b/Dockerfile.vm
deleted file mode 100644
index 024264cb6..000000000
--- a/Dockerfile.vm
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:16.04
-
-MAINTAINER Alex Harvey
-
-RUN apt-get update && apt-get install -y wget
-
-# Get buildroot
-RUN mkdir /buildroot
-WORKDIR /buildroot/
-RUN wget https://buildroot.org/downloads/buildroot-2017.11.1.tar.gz
-RUN tar xvzf buildroot-2017.11.1.tar.gz
-
-# Get build requirements
-RUN apt-get install -y patch cpio python unzip rsync bc bzip2 ncurses-dev git make g++ python-matplotlib python-numpy
-
-# Download all the required files
-COPY vm/buildroot.config /buildroot/buildroot-2017.11.1/.config
-COPY vm/linux.config /buildroot/buildroot-2017.11.1/linux.config
-WORKDIR /buildroot/buildroot-2017.11.1/
-RUN make source
-
-# CMD /buildroot/buildroot-2017.11.1/make