diff --git a/docker/images/builder8/1.8/Dockerfile b/docker/images/builder8/1.8/Dockerfile
new file mode 100644
index 00000000..09b99b12
--- /dev/null
+++ b/docker/images/builder8/1.8/Dockerfile
@@ -0,0 +1,17 @@
+############################################################
+#
+# Minor updates.
+# - libelf-dev for kernel 4.14
+# - cryptsetup-bin
+#
+############################################################
+FROM opennetworklinux/builder8:1.7
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+RUN apt-get update && apt-get install libelf-dev && apt-get install cryptsetup-bin
+
+#
+# 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.8/Makefile b/docker/images/builder8/1.8/Makefile
new file mode 100644
index 00000000..7019be6b
--- /dev/null
+++ b/docker/images/builder8/1.8/Makefile
@@ -0,0 +1,19 @@
+VERSION=1.8
+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)