diff --git a/docker/images/builder8/1.0/Dockerfile b/docker/images/builder8/1.0/Dockerfile
new file mode 100644
index 00000000..ce5e623e
--- /dev/null
+++ b/docker/images/builder8/1.0/Dockerfile
@@ -0,0 +1,149 @@
+FROM debian:8.2
+MAINTAINER Rob Sherwood <rob.sherwood@bigswitch.com>
+
+# First round of dependences
+RUN apt-get update && apt-get install -y \
+        apt \
+        apt-cacher-ng \
+        apt-file \
+        apt-utils \
+        autoconf \
+        automake \
+        autotools-dev \
+	bash-completion \
+        bc \
+        binfmt-support \
+        binfmt-support \
+        bison \
+        bsdmainutils \
+        build-essential \
+        ccache \
+        cdbs \
+        cpio \
+        debhelper \
+        debhelper \
+        debhelper \
+	device-tree-compiler \
+        devscripts \
+        devscripts \
+        dialog \
+        dosfstools \
+        dpkg-sig \
+        file \
+        flex \
+        gcc \
+        genisoimage \
+	git \
+        ifupdown \
+        iproute \
+        iputils-ping \
+	isolinux \
+        kmod \
+        less \
+        libc6-dev \
+	libcurl4-nss-dev \
+	libdouble-conversion-dev \
+        libedit-dev \
+	libevent-dev \
+	libgoogle-glog-dev \
+        libi2c-dev \
+	libkrb5-dev \
+	libnuma-dev \
+	libsasl2-dev \
+	libsnappy-dev \
+	libssl-dev \
+	libstdc++6=4.9.2-10 \
+        libtool \
+        locales \
+        lsof \
+        make \
+        mingetty \
+        mtd-utils \
+        mtools \
+        multistrap \
+        nano \
+        ncurses-dev \
+        netbase \
+        net-tools \
+        nfs-common \
+        openssh-server \
+        pkg-config \
+        pkg-config \
+        procps \
+        psmisc \
+        python \
+        python-debian \
+        python-yaml \
+        qemu \
+        qemu-user-static \
+        realpath \
+        realpath \
+        rsyslog \
+	ruby \
+	ruby-dev \
+	rubygems \
+	screen \
+        squashfs-tools \
+        sudo \
+        syslinux-utils \
+        traceroute \
+        u-boot-tools \
+        vim-tiny \
+        wget \
+        zile \
+        zip
+RUN     gem install --version 1.3.3 fpm 
+
+# Now the unstable deps and cross compilers
+# NOTE 1: texinfo 5.x and above breaks the buildroot build, thus the specific 4.x version
+# NOTE 2: this cp is needed to fix an i2c compile problem
+# NOTE 3: the /etc/apt/apt.conf.d/docker-* options break multistrap so
+#       that it can't find.  Essential packages or resolve apt.opennetlinux.org
+# NOTE 4: the default qemu-user-static (1.2) dies with a segfault in
+#       `make onl-powerpc`; use 1.4 instead
+
+RUN echo 'APT::Get::AllowUnauthenticated "true";\nAPT::Get::Assume-Yes "true";' | tee /etc/apt/apt.conf.d/99opennetworklinux && \
+    echo "deb http://apt.opennetlinux.org/debian/ unstable main" | tee /etc/apt/sources.list.d/opennetlinux.list && \
+    curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | sudo apt-key add - && \
+    echo "deb http://emdebian.org/tools/debian/ jessie main" | tee /etc/apt/sources.list.d/embedian-jessie.list && \
+    dpkg --add-architecture powerpc && \
+    apt-get update && \
+    apt-get install -y  \
+        binutils-powerpc-linux-gnu \
+        libc6-dev-powerpc-cross \
+	crossbuild-essential-powerpc \
+	cross-gcc-dev \
+	folly \
+	fbthrift \
+	wangle \
+        libgomp1-powerpc-cross  && \
+   wget "http://ftp.us.debian.org/debian/pool/main/t/texinfo/texinfo_4.13a.dfsg.1-10_amd64.deb" && \
+   dpkg -i texinfo_4.13a.dfsg.1-10_amd64.deb && \
+   wget "http://ftp.us.debian.org/debian/pool/main/e/emdebian-crush/xapt_2.2.19_all.deb" && \
+   dpkg -i xapt_2.2.19_all.deb && \
+
+    xapt -a powerpc libedit-dev ncurses-dev libsensors4-dev libwrap0-dev libssl-dev libsnmp-dev
+#    update-alternatives --install /usr/bin/powerpc-linux-gnu-gcc powerpc-linux-gnu-gcc 10 && 
+
+#
+# The i2c-dev.h user/kernel header conflict is a nightmare.
+#
+# The ONLP implementation expects a new file called <linux/i2c-device.h> to be in place which contains the correct user-space driver definitions.
+# This should be manually populated here after the toolchains have been installed.
+#
+RUN cp /usr/include/linux/i2c-dev.h /usr/include/linux/i2c-devices.h && \
+    cp /usr/include/linux/i2c-dev.h /usr/powerpc-linux-gnu/include/linux/i2c-devices.h
+ 
+RUN rm /etc/apt/apt.conf.d/docker-* && \
+    wget "https://launchpad.net/ubuntu/+source/qemu/1.4.0+dfsg-1expubuntu3/+build/4336762/+files/qemu-user-static_1.4.0%2Bdfsg-1expubuntu3_amd64.deb" && \
+    dpkg -i qemu-user-static_1.4.0+dfsg-1expubuntu3_amd64.deb
+
+#
+# Copy the docker shell init script to /bin
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id
+
+RUN apt-get install -y \
+    libstdc++6=4.9.2-10 --force-yes
+RUN apt-get install libboost-all-dev cmake
diff --git a/docker/images/builder8/1.0/Makefile b/docker/images/builder8/1.0/Makefile
new file mode 100644
index 00000000..8ada33c8
--- /dev/null
+++ b/docker/images/builder8/1.0/Makefile
@@ -0,0 +1,16 @@
+VERSION=1.0
+USER=opennetworklinux
+REPO=builder8
+
+TOOLS=../../../tools/docker_shell ../../../tools/container-id
+
+build: check_version
+	cp $(TOOLS) .
+	docker build -t $(USER)/$(REPO):$(VERSION) .
+	rm -rf $(notdir $(TOOLS))
+
+#
+# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites
+# when a new image is built but the VERSION variable is not updated.
+#
+check_version:
diff --git a/packages/base/any/initrds/buildroot/builds/buildroot-mirror b/packages/base/any/initrds/buildroot/builds/buildroot-mirror
index 8290a626..5e1a5c1e 160000
--- a/packages/base/any/initrds/buildroot/builds/buildroot-mirror
+++ b/packages/base/any/initrds/buildroot/builds/buildroot-mirror
@@ -1 +1 @@
-Subproject commit 8290a6261aaa4af8e8a4b3cbd6c8bedd83622572
+Subproject commit 5e1a5c1ef7bac890845920809147ee2070dc96ea