diff --git a/docker/images/builder9/1.3/Dockerfile b/docker/images/builder9/1.3/Dockerfile
new file mode 100644
index 00000000..6b4f733c
--- /dev/null
+++ b/docker/images/builder9/1.3/Dockerfile
@@ -0,0 +1,27 @@
+############################################################
+#
+# Add armel and armhf
+#
+############################################################
+FROM opennetworklinux/builder9:1.2
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+RUN dpkg --add-architecture armel
+RUN dpkg --add-architecture armhf
+
+RUN apt-get update && apt-get upgrade -y
+
+RUN apt-get install -y \
+    crossbuild-essential-armel \
+    gcc-arm-linux-gnueabi \
+    crossbuild-essential-armhf \
+    gcc-arm-linux-gnueabi
+
+RUN xapt -a armel libedit-dev ncurses-dev libsensors4-dev libwrap0-dev libssl-dev libsnmp-dev
+RUN xapt -a armhf libedit-dev ncurses-dev libsensors4-dev libwrap0-dev libssl-dev libsnmp-dev
+
+#
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id
diff --git a/docker/images/builder9/1.3/Makefile b/docker/images/builder9/1.3/Makefile
new file mode 100644
index 00000000..e3d03211
--- /dev/null
+++ b/docker/images/builder9/1.3/Makefile
@@ -0,0 +1,19 @@
+VERSION=1.3
+USER=opennetworklinux
+REPO=builder9
+
+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)
diff --git a/docker/tools/onlbuilder b/docker/tools/onlbuilder
index d9cebc3b..8bd037fe 100755
--- a/docker/tools/onlbuilder
+++ b/docker/tools/onlbuilder
@@ -19,7 +19,7 @@ g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S")
 
 g_builder7_image_name="opennetworklinux/builder7:1.2"
 g_builder8_image_name="opennetworklinux/builder8:1.9"
-g_builder9_image_name="opennetworklinux/builder9:1.2"
+g_builder9_image_name="opennetworklinux/builder9:1.3"
 
 g_default_image_name=g_builder8_image_name
 g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)
diff --git a/sm/build-artifacts b/sm/build-artifacts
index 48603f21..aa92be2f 160000
--- a/sm/build-artifacts
+++ b/sm/build-artifacts
@@ -1 +1 @@
-Subproject commit 48603f21bc4e764317ae890444229c76ef2d1f8f
+Subproject commit aa92be2faa3a4b3822bedeecd6d756e7755ed8ed
diff --git a/sm/infra b/sm/infra
index f78cc911..168b695e 160000
--- a/sm/infra
+++ b/sm/infra
@@ -1 +1 @@
-Subproject commit f78cc91121bf520b48b4888f08e055ed92b9fbf2
+Subproject commit 168b695e51241be2823111f105b129236a1d79f8