diff --git a/Makefile b/Makefile
index ccfd845a6..e0395e5f8 100644
--- a/Makefile
+++ b/Makefile
@@ -120,14 +120,14 @@ bin/%: $(GO_SOURCE)
 # directory so that subsequent builds are faster
 build/docker/bin/%:
 	@echo "Building $@"
-	@mkdir -p $(@D) build/docker/$(@F)/pkg build/docker/cache
-	@$(DRUN) \
+	mkdir -p $(@D) build/docker/$(@F)/pkg build/docker/cache
+	$(DRUN) \
 		-v $(abspath build/docker/bin):/opt/gopath/bin \
 		-v $(abspath build/docker/$(@F)/pkg):/opt/gopath/pkg \
 		-v $(abspath build/docker/cache):/opt/gopath/cache \
 		-e GOCACHE=/opt/gopath/cache \
 		$(BASE_DOCKER_NS)/fabric-baseimage:$(BASE_DOCKER_TAG) \
-		go install -ldflags "$(DOCKER_GO_LDFLAGS)" $(PKGNAME)/$(path-map.${@F})
+		go install -tags=single_cert -ldflags "$(DOCKER_GO_LDFLAGS)" $(PKGNAME)/$(path-map.${@F})
 	@touch $@
 
 build/image/%/$(DUMMY): Makefile build/image/%/payload
diff --git a/images/fabric-ca/Dockerfile.in b/images/fabric-ca/Dockerfile.in
index 91a7d8a04..c2bbccc73 100644
--- a/images/fabric-ca/Dockerfile.in
+++ b/images/fabric-ca/Dockerfile.in
@@ -12,8 +12,8 @@ RUN chmod +x /usr/local/bin/fabric-ca-client
 COPY payload/fabric-ca-server /usr/local/bin
 RUN chmod +x /usr/local/bin/fabric-ca-server
 #use aliyun source
-sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list
-sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list
+RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list
+RUN sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list
 RUN apt-get update && apt-get install -y netcat && rm -rf /var/cache/apt
 
 # Copy the same certificates that are currently hardcoded into the peers