diff --git a/docker/images/builder8/1.6/Dockerfile b/docker/images/builder8/1.6/Dockerfile
new file mode 100644
index 00000000..b166f6d0
--- /dev/null
+++ b/docker/images/builder8/1.6/Dockerfile
@@ -0,0 +1,20 @@
+############################################################
+#
+# 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 \
+libreadline-dev texinfo libjson-c-dev pkg-config flex \
+python-pip libc-ares-dev python3-dev texlive-latex-base \
+texlive-generic-recommended libpam0g-dev libpam0g-dev \
+libcap-dev hardening-wrapper libpcre3-dev chrpath \
+dh-autoreconf libjson0 libjson0-dev dh-systemd \
+libsystemd-dev python-ipaddr groff devscripts
+
+# 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)