diff --git a/docker/images/builder8/1.6/Dockerfile b/docker/images/builder8/1.6/Dockerfile
new file mode 100644
index 00000000..193be33a
--- /dev/null
+++ b/docker/images/builder8/1.6/Dockerfile
@@ -0,0 +1,37 @@
+############################################################
+#
+# Update with FRR support dependencies.
+#
+############################################################
+FROM opennetworklinux/builder8:1.5
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+RUN apt-get update && apt-get install -y \
+chrpath devscripts dh-autoreconf dh-systemd flex \
+hardening-wrapper libcap-dev libc-ares-dev libjson0 \
+libjson0-dev libjson-c-dev libpam0g-dev libpcre3-dev \
+libreadline-dev libsystemd-dev pkg-config \
+texlive-generic-recommended texinfo texlive-latex-base
+
+RUN xapt -a powerpc chrpath hardening-wrapper \
+libcap-dev libc-ares-dev libjson0 libjson0-dev \
+libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \
+libsystemd-dev pkg-config texinfo libreadline6-dev \
+libtext-unidecode-perl libintl-perl libxml-libxml-perl
+
+RUN xapt -a arm64 chrpath hardening-wrapper \
+libcap-dev libc-ares-dev libjson0 libjson0-dev \
+libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \
+libsystemd-dev pkg-config texinfo libreadline6-dev \
+libintl-perl libxml-libxml-perl
+
+RUN xapt -a armel chrpath hardening-wrapper \
+libcap-dev libc-ares-dev libjson0 libjson0-dev \
+libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \
+libsystemd-dev pkg-config texinfo libreadline6-dev \
+libintl-perl libxml-libxml-perl
+
+# 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.6/Makefile b/docker/images/builder8/1.6/Makefile
new file mode 100644
index 00000000..1177e2ad
--- /dev/null
+++ b/docker/images/builder8/1.6/Makefile
@@ -0,0 +1,19 @@
+VERSION=1.6
+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)