diff --git a/Makefile b/Makefile
index 18c95385eaf..42ce36f81d5 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@ endif
 PKGNAME = github.com/$(PROJECT_NAME)
 GO_LDFLAGS = -X $(PKGNAME)/metadata.Version=$(PROJECT_VERSION)
 CGO_FLAGS = CGO_CFLAGS=" "
+GO_DOCKER_FLAGS= -ldflags "$(GO_LDFLAGS) -linkmode external -extldflags '-static -lpthread'"
 ARCH=$(shell uname -m)
 OS=$(shell uname)
 CHAINTOOL_RELEASE=v0.10.0
@@ -100,7 +101,7 @@ GOSHIM_DEPS = $(shell ./scripts/goListFiles.sh $(PKGNAME)/core/chaincode/shim |
 JAVASHIM_DEPS =  $(shell git ls-files core/chaincode/shim/java)
 PROTOS = $(shell git ls-files *.proto | grep -v vendor)
 PROJECT_FILES = $(shell git ls-files)
-IMAGES = peer orderer ccenv javaenv testenv
+IMAGES = peer orderer ccenv javaenv testenv runtime
 
 pkgmap.peer           := $(PKGNAME)/peer
 pkgmap.orderer        := $(PKGNAME)/orderer
@@ -160,12 +161,12 @@ linter: testenv
 build/docker/bin/%: $(PROJECT_FILES)
 	$(eval TARGET = ${patsubst build/docker/bin/%,%,${@}})
 	@echo "Building $@"
-	@mkdir -p build/docker/bin build/docker/pkg
+	@mkdir -p build/docker/bin build/docker/$(TARGET)/pkg
 	@$(DRUN) \
 		-v $(abspath build/docker/bin):/opt/gopath/bin \
-		-v $(abspath build/docker/pkg):/opt/gopath/pkg \
+		-v $(abspath build/docker/$(TARGET)/pkg):/opt/gopath/pkg \
 		hyperledger/fabric-baseimage:$(BASE_DOCKER_TAG) \
-		go install -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F))
+		go install $(GO_DOCKER_FLAGS) $(pkgmap.$(@F))
 	@touch $@
 
 build/bin:
@@ -181,10 +182,19 @@ build/docker/gotools: gotools/Makefile
 		hyperledger/fabric-baseimage:$(BASE_DOCKER_TAG) \
 		make install BINDIR=/opt/gotools/bin OBJDIR=/opt/gotools/obj
 
-# Both peer and peer-docker depend on ccenv and javaenv (all docker env images it supports)
+build/docker/busybox:
+	@$(DRUN) \
+		hyperledger/fabric-baseimage:$(BASE_DOCKER_TAG) \
+		make -f busybox/Makefile install BINDIR=$(@D)
+
+# Both peer and peer-docker depend on ccenv and javaenv (all docker env images it supports).
 build/bin/peer: build/image/ccenv/.dummy build/image/javaenv/.dummy
 build/image/peer/.dummy: build/image/ccenv/.dummy build/image/javaenv/.dummy
 
+# Both peer-docker and orderer-docker depend on the runtime image
+build/image/peer/.dummy: build/image/runtime/.dummy
+build/image/orderer/.dummy: build/image/runtime/.dummy
+
 build/bin/%: $(PROJECT_FILES)
 	@mkdir -p $(@D)
 	@echo "$@"
@@ -205,6 +215,7 @@ build/image/peer/payload:       build/docker/bin/peer \
 build/image/orderer/payload:    build/docker/bin/orderer \
 				orderer/orderer.yaml
 build/image/testenv/payload:    build/gotools.tar.bz2
+build/image/runtime/payload:    build/docker/busybox
 
 build/image/%/payload:
 	mkdir -p $@
diff --git a/busybox/Makefile b/busybox/Makefile
new file mode 100644
index 00000000000..1c6848b1ba7
--- /dev/null
+++ b/busybox/Makefile
@@ -0,0 +1,27 @@
+BUSYBOX_VER=1.25.1
+BUSYBOX_URL=https://www.busybox.net/downloads/busybox-$(BUSYBOX_VER).tar.bz2
+
+OBJDIR=build/busybox-$(BUSYBOX_VER)
+
+all: $(OBJDIR)/busybox
+
+install: $(BINDIR)/busybox
+
+$(BINDIR)/busybox: $(OBJDIR)/busybox
+	mkdir -p $(@D)
+	cp $< $@
+
+$(OBJDIR)/.source:
+	mkdir -p $(@D)
+	curl -L $(BUSYBOX_URL) | (cd $(@D); tar --strip-components=1 -jx)
+	touch $@
+
+$(OBJDIR)/.config: $(OBJDIR)/.source
+	make -C $(@D) defconfig
+
+$(OBJDIR)/busybox: Makefile $(OBJDIR)/.config
+	make -C $(@D) -l 2.5 -j all LDFLAGS=-static
+
+clean:
+	-rm -rf $(OBJDIR)
+
diff --git a/images/orderer/Dockerfile.in b/images/orderer/Dockerfile.in
index 3888300683d..67fa3f7b062 100644
--- a/images/orderer/Dockerfile.in
+++ b/images/orderer/Dockerfile.in
@@ -1,4 +1,4 @@
-FROM hyperledger/fabric-baseimage:_BASE_TAG_
+FROM hyperledger/fabric-runtime:_TAG_
 ENV ORDERER_CFG_PATH /etc/hyperledger/fabric
 RUN mkdir -p /var/hyperledger/db /etc/hyperledger/fabric
 COPY payload/orderer /usr/local/bin
diff --git a/images/peer/Dockerfile.in b/images/peer/Dockerfile.in
index 23777d80a96..fe9f85339e6 100644
--- a/images/peer/Dockerfile.in
+++ b/images/peer/Dockerfile.in
@@ -1,4 +1,4 @@
-FROM hyperledger/fabric-baseimage:_BASE_TAG_
+FROM hyperledger/fabric-runtime:_TAG_
 ENV PEER_CFG_PATH /etc/hyperledger/fabric
 RUN mkdir -p /var/hyperledger/db $PEER_CFG_PATH/msp
 COPY payload/peer /usr/local/bin
diff --git a/images/runtime/Dockerfile.in b/images/runtime/Dockerfile.in
new file mode 100644
index 00000000000..1691ad0a479
--- /dev/null
+++ b/images/runtime/Dockerfile.in
@@ -0,0 +1,6 @@
+FROM scratch
+COPY payload/busybox /bin/busybox
+RUN ["/bin/busybox", "mkdir", "-p", "/usr/bin", "/sbin", "/usr/sbin"]
+RUN ["/bin/busybox", "--install"]
+RUN mkdir -p /usr/local/bin
+ENV PATH=$PATH:/usr/local/bin