diff --git a/docker/images/builder8/1.7/Dockerfile b/docker/images/builder8/1.7/Dockerfile
new file mode 100644
index 00000000..55ffdadf
--- /dev/null
+++ b/docker/images/builder8/1.7/Dockerfile
@@ -0,0 +1,27 @@
+############################################################
+#
+# Fix broken cross dependencies.
+# Update Packages.
+# Additional build dependencies.
+#
+############################################################
+FROM opennetworklinux/builder8:1.6
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+#ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get install -f && \
+    apt-get update
+
+RUN xapt -a powerpc libsnmp-dev && \
+    xapt -a armel   libsnmp-dev && \
+    xapt -a arm64   libsnmp-dev
+
+RUN apt-get install -f
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install tshark -y
+RUN sudo apt-get install -yq libpcap-dev libxml2-dev python-dev g++ swig tcpreplay libusb-dev
+
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id
diff --git a/docker/images/builder8/1.7/Makefile b/docker/images/builder8/1.7/Makefile
new file mode 100644
index 00000000..59f1dc05
--- /dev/null
+++ b/docker/images/builder8/1.7/Makefile
@@ -0,0 +1,19 @@
+VERSION=1.7
+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:
+
+push:
+	docker push $(USER)/$(REPO):$(VERSION)