diff --git a/test/images/hostexec/Makefile b/test/images/Makefile
similarity index 53%
rename from test/images/hostexec/Makefile
rename to test/images/Makefile
index 04b4008e4c2..9d5aeb5ebc5 100644
--- a/test/images/hostexec/Makefile
+++ b/test/images/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2016 The Kubernetes Authors.
+# Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,19 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY: all image push clean
+REGISTRY ?= gcr.io/k8s-e2e-images
+GOARM=7
+QEMUVERSION=v2.7.0
+GOLANG_VERSION=1.8.3
+export
 
-TAG = 1.2
-PREFIX = gcr.io/google_containers
+ifndef WHAT
+$(error WHAT is a required variable, ex: make all WHAT=net)
+endif
 
+# Build code.
+#
+# Args:
+#   WHAT: Directory names to build.
+#
+# Example:
+#   make all WHAT=clusterapi-tester
+all: all-container
 
-all: push
+all-container:
+	./image-util.sh build $(WHAT)
 
-image:
-	docker build --pull -t $(PREFIX)/hostexec:$(TAG) .
+all-push: all-container
+	./image-util.sh push $(WHAT)
 
-push: image
-	gcloud docker -- push $(PREFIX)/hostexec:$(TAG)
-
-clean:
-	rm -f hostexec
+.PHONY: all all-push all-container
diff --git a/test/images/clusterapi-tester/BASEIMAGE b/test/images/clusterapi-tester/BASEIMAGE
new file mode 100644
index 00000000000..44329aaa5b1
--- /dev/null
+++ b/test/images/clusterapi-tester/BASEIMAGE
@@ -0,0 +1,5 @@
+amd64=busybox
+arm=arm32v6/busybox
+arm64=arm64v8/busybox
+ppc64le=ppc64le/busybox
+s390x=s390x/busybox
diff --git a/test/images/clusterapi-tester/BUILD b/test/images/clusterapi-tester/BUILD
index 2e20ac80d0e..98c5c2c528c 100644
--- a/test/images/clusterapi-tester/BUILD
+++ b/test/images/clusterapi-tester/BUILD
@@ -16,7 +16,7 @@ go_binary(
 
 go_library(
     name = "go_default_library",
-    srcs = ["main.go"],
+    srcs = ["clusterapi-tester.go"],
     tags = ["automanaged"],
     deps = [
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
diff --git a/test/images/clusterapi-tester/Dockerfile b/test/images/clusterapi-tester/Dockerfile
index 9327d227545..cfb8401d859 100644
--- a/test/images/clusterapi-tester/Dockerfile
+++ b/test/images/clusterapi-tester/Dockerfile
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM busybox
-ADD main main
-ENTRYPOINT ["/main"]
+FROM BASEIMAGE
+ADD clusterapi-tester /clusterapi-tester
+ENTRYPOINT ["/clusterapi-tester"]
diff --git a/test/images/clusterapi-tester/Makefile b/test/images/clusterapi-tester/Makefile
index 02a0e5616b6..369c5cad87e 100644
--- a/test/images/clusterapi-tester/Makefile
+++ b/test/images/clusterapi-tester/Makefile
@@ -12,20 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-all: push
+BIN=clusterapi-tester
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-# 0.0 shouldn't clobber any released builds
-TAG = 1.0
-PREFIX = gcr.io/google_containers/clusterapi-tester
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/clusterapi-tester && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN)" 
 
-main: main.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' -o main ./main.go
-
-container: main
-	docker build --pull -t $(PREFIX):$(TAG) .
-
-push: container
-	gcloud docker -- push $(PREFIX):$(TAG)
-
-clean:
-	rm -f main
+.PHONY: bin
diff --git a/test/images/clusterapi-tester/NAME b/test/images/clusterapi-tester/NAME
new file mode 100644
index 00000000000..97185c48995
--- /dev/null
+++ b/test/images/clusterapi-tester/NAME
@@ -0,0 +1 @@
+clusterapi-tester
diff --git a/test/images/clusterapi-tester/VERSION b/test/images/clusterapi-tester/VERSION
new file mode 100644
index 00000000000..9459d4ba2a0
--- /dev/null
+++ b/test/images/clusterapi-tester/VERSION
@@ -0,0 +1 @@
+1.1
diff --git a/test/images/clusterapi-tester/main.go b/test/images/clusterapi-tester/clusterapi-tester.go
similarity index 100%
rename from test/images/clusterapi-tester/main.go
rename to test/images/clusterapi-tester/clusterapi-tester.go
diff --git a/test/images/dnsutils/BASEIMAGE b/test/images/dnsutils/BASEIMAGE
new file mode 100644
index 00000000000..114844f395e
--- /dev/null
+++ b/test/images/dnsutils/BASEIMAGE
@@ -0,0 +1,4 @@
+amd64=alpine:3.6
+arm=arm32v6/alpine:3.6
+arm64=arm64v8/alpine:3.6
+ppc64le=ppc64le/alpine:3.6
diff --git a/test/images/dnsutils/Dockerfile b/test/images/dnsutils/Dockerfile
index 2d037e9f843..d041c62703f 100644
--- a/test/images/dnsutils/Dockerfile
+++ b/test/images/dnsutils/Dockerfile
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine
+FROM BASEIMAGE
+
+CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
 
 RUN apk add --no-cache bind-tools
diff --git a/test/images/dnsutils/NAME b/test/images/dnsutils/NAME
new file mode 100644
index 00000000000..bca3eb0f23f
--- /dev/null
+++ b/test/images/dnsutils/NAME
@@ -0,0 +1 @@
+dnsutils
diff --git a/test/images/dnsutils/VERSION b/test/images/dnsutils/VERSION
new file mode 100644
index 00000000000..9459d4ba2a0
--- /dev/null
+++ b/test/images/dnsutils/VERSION
@@ -0,0 +1 @@
+1.1
diff --git a/test/images/entrypoint-tester/Makefile b/test/images/entrypoint-tester/Makefile
index a15e6670582..9d7c516fae6 100644
--- a/test/images/entrypoint-tester/Makefile
+++ b/test/images/entrypoint-tester/Makefile
@@ -12,19 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 0.1
-PREFIX = kubernetes
+BIN=ep
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: push
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/entrypoint-tester && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-ep: ep.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./ep.go
-
-image: ep
-	sudo docker build --pull -t $(PREFIX)/eptest:$(TAG) .
-
-push: image
-	sudo docker push $(PREFIX)/eptest:$(TAG)
-
-clean:
-	rm -f ep
+.PHONY: bin
diff --git a/test/images/entrypoint-tester/NAME b/test/images/entrypoint-tester/NAME
new file mode 100644
index 00000000000..e2d8e243c18
--- /dev/null
+++ b/test/images/entrypoint-tester/NAME
@@ -0,0 +1 @@
+ep
diff --git a/test/images/entrypoint-tester/VERSION b/test/images/entrypoint-tester/VERSION
new file mode 100644
index 00000000000..3b04cfb60da
--- /dev/null
+++ b/test/images/entrypoint-tester/VERSION
@@ -0,0 +1 @@
+0.2
diff --git a/test/images/fakegitserver/Dockerfile b/test/images/fakegitserver/Dockerfile
index 8ec3654f010..e25b13e1d6a 100644
--- a/test/images/fakegitserver/Dockerfile
+++ b/test/images/fakegitserver/Dockerfile
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 FROM scratch
-ADD GITHASH.txt /
-ADD gitserver /
-ENTRYPOINT ["/gitserver"]
+COPY GITHASH.txt /
+COPY fakegitserver /
+ENTRYPOINT ["/fakegitserver"]
+
diff --git a/test/images/fakegitserver/Makefile b/test/images/fakegitserver/Makefile
index 98b19cfb1c7..b99b9e049f2 100644
--- a/test/images/fakegitserver/Makefile
+++ b/test/images/fakegitserver/Makefile
@@ -12,21 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY:	all image push clean
+BIN=fakegitserver
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-TAG = 0.1
-PREFIX = gcr.io/google_containers
-IMAGE = fakegitserver
-ARCH = amd64
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/fakegitserver && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
+	@echo $(shell git rev-parse HEAD) > $(TARGET)/GITHASH.txt
 
-image:
-	./prepare.sh $(ARCH)
-	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
-
-all: push
-
-clean:
-	rm -f gitserver GITHASH.txt
+.PHONY: bin
diff --git a/test/images/fakegitserver/NAME b/test/images/fakegitserver/NAME
new file mode 100644
index 00000000000..1f1e4b248bf
--- /dev/null
+++ b/test/images/fakegitserver/NAME
@@ -0,0 +1 @@
+fakegitserver
diff --git a/test/images/fakegitserver/VERSION b/test/images/fakegitserver/VERSION
new file mode 100644
index 00000000000..3b04cfb60da
--- /dev/null
+++ b/test/images/fakegitserver/VERSION
@@ -0,0 +1 @@
+0.2
diff --git a/test/images/fakegitserver/prepare.sh b/test/images/fakegitserver/prepare.sh
deleted file mode 100755
index 414e0447974..00000000000
--- a/test/images/fakegitserver/prepare.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-set -x
-
-ARCH=$1
-
-# Build the binary.
-CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -a -installsuffix cgo -ldflags '-w' ./gitserver.go
-
-# Write down the current commit hash.
-echo $(git rev-parse HEAD) >> GITHASH.txt
diff --git a/test/images/goproxy/Makefile b/test/images/goproxy/Makefile
index f7408cbd95d..ce0b1bcaa58 100644
--- a/test/images/goproxy/Makefile
+++ b/test/images/goproxy/Makefile
@@ -12,19 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 0.1
-PREFIX = gcr.io/google_containers
+BIN=goproxy
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: push
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/goproxy && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-goproxy: goproxy.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./goproxy.go
-
-image: goproxy
-	docker build --pull -t $(PREFIX)/goproxy:$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/goproxy:$(TAG)
-
-clean:
-	rm -f goproxy
+.PHONY: bin
diff --git a/test/images/goproxy/NAME b/test/images/goproxy/NAME
new file mode 100644
index 00000000000..663e1754bde
--- /dev/null
+++ b/test/images/goproxy/NAME
@@ -0,0 +1 @@
+goproxy
diff --git a/test/images/goproxy/VERSION b/test/images/goproxy/VERSION
new file mode 100644
index 00000000000..3b04cfb60da
--- /dev/null
+++ b/test/images/goproxy/VERSION
@@ -0,0 +1 @@
+0.2
diff --git a/test/images/hostexec/BASEIMAGE b/test/images/hostexec/BASEIMAGE
new file mode 100644
index 00000000000..114844f395e
--- /dev/null
+++ b/test/images/hostexec/BASEIMAGE
@@ -0,0 +1,4 @@
+amd64=alpine:3.6
+arm=arm32v6/alpine:3.6
+arm64=arm64v8/alpine:3.6
+ppc64le=ppc64le/alpine:3.6
diff --git a/test/images/hostexec/Dockerfile b/test/images/hostexec/Dockerfile
index 98f2565f7c2..af6a4cb6181 100644
--- a/test/images/hostexec/Dockerfile
+++ b/test/images/hostexec/Dockerfile
@@ -12,12 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.2
+FROM BASEIMAGE
+
+CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
 
 # install necessary packages:
 # - curl, nc: used by a lot of e2e tests
 # - iproute2: includes ss used in NodePort tests
-run apk --update add curl netcat-openbsd iproute2 && rm -rf /var/cache/apk/*
+RUN apk --update add curl netcat-openbsd iproute2 && rm -rf /var/cache/apk/*
 
 # wait forever
 CMD rm -f /fifo && mkfifo /fifo && exec cat </fifo
diff --git a/test/images/hostexec/NAME b/test/images/hostexec/NAME
new file mode 100644
index 00000000000..0d7e9c73d9d
--- /dev/null
+++ b/test/images/hostexec/NAME
@@ -0,0 +1 @@
+hostexec
diff --git a/test/images/hostexec/VERSION b/test/images/hostexec/VERSION
new file mode 100644
index 00000000000..7e32cd56983
--- /dev/null
+++ b/test/images/hostexec/VERSION
@@ -0,0 +1 @@
+1.3
diff --git a/test/images/image-util.sh b/test/images/image-util.sh
new file mode 100755
index 00000000000..e6c8ade0819
--- /dev/null
+++ b/test/images/image-util.sh
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+TASK=$1
+IMAGE=$2
+
+# Mapping of go ARCH to actual architectures shipped part of multiarch/qemu-user-static project
+declare -A QEMUARCHS=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["ppc64le"]="ppc64le" ["s390x"]="s390x" )
+
+# Returns list of all supported architectures from BASEIMAGE file
+listArchs() {
+  cut -d "=" -f 1 ${IMAGE}/BASEIMAGE
+}
+
+# Returns baseimage need to used in Dockerfile for any given architecture
+getBaseImage() {
+  arch=$1
+  echo $(grep "${arch}=" BASEIMAGE | cut -d= -f2)
+}
+
+# This function will build test image for all the architectures
+# mentioned in BASEIMAGE file. In the absence of BASEIMAGE file,
+# it will build for all the supported arch list - amd64, arm,
+# arm64, ppc64le, s390x
+build() {
+  if [[ -f ${IMAGE}/BASEIMAGE ]]; then
+    archs=$(listArchs)
+  else
+    archs=${!QEMUARCHS[@]}
+  fi
+
+  for arch in ${archs}; do
+    echo "Building image for ${IMAGE} ARCH: ${arch}..."
+
+    # Create a temporary directory for every architecture and copy the image content
+    # and build the image from temporary directory
+    temp_dir=$(mktemp -d)
+    cp -r ${IMAGE}/* ${temp_dir}
+    if [[ -f ${IMAGE}/Makefile ]]; then
+      # make bin will take care of all the prerequisites needed
+      # for building the docker image
+      make -C ${IMAGE} bin ARCH=${arch} TARGET=${temp_dir}
+    fi
+    pushd ${temp_dir}
+    # image tag
+    TAG=$(<VERSION)
+    # image name
+    IMAGENAME=$(<NAME)
+
+    if [[ -f BASEIMAGE ]]; then
+      BASEIMAGE=$(getBaseImage ${arch})
+      sed -i "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
+    fi
+
+    # copy the qemu-*-static binary to docker image to build the multi architecture image on x86 platform
+    if [[ $(grep "CROSS_BUILD_" Dockerfile) ]]; then
+      if [[ "${arch}" == "amd64" ]]; then
+        sed -i "/CROSS_BUILD_/d" Dockerfile
+      else
+        sed -i "s|QEMUARCH|${QEMUARCHS[$arch]}|g" Dockerfile
+        # Register qemu-*-static for all supported processors except the current one
+        docker run --rm --privileged multiarch/qemu-user-static:register --reset
+        curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/${QEMUVERSION}/x86_64_qemu-${QEMUARCHS[$arch]}-static.tar.gz | tar -xz -C ${temp_dir}
+        sed -i "s/CROSS_BUILD_//g" Dockerfile
+      fi
+    fi
+
+    docker build --pull -t ${REGISTRY}/${IMAGENAME}-${arch}:${TAG} .
+
+    # Image without any arch postfix will point to amd64 by default.
+    if [[ "${arch}" == "amd64" ]]; then
+      docker tag ${REGISTRY}/${IMAGENAME}-${arch}:${TAG} ${REGISTRY}/${IMAGENAME}:${TAG}
+    fi
+    popd
+  done
+}
+
+# This function will push the docker images
+push() {
+  if [[ -f ${IMAGE}/BASEIMAGE ]]; then
+    archs=$(listArchs)
+  else
+    archs=${!QEMUARCHS[@]}
+  fi
+  for arch in ${archs}; do
+    IMAGENAME=$(<${IMAGE}/NAME)
+    TAG=$(<${IMAGE}/VERSION)
+    gcloud docker -- push ${REGISTRY}/${IMAGENAME}-${arch}:${TAG}
+    if [[ "${arch}" == "amd64" ]]; then
+      gcloud docker -- push ${REGISTRY}/${IMAGENAME}:${TAG}
+    fi
+  done
+}
+
+eval ${TASK}
diff --git a/test/images/iperf/BASEIMAGE b/test/images/iperf/BASEIMAGE
new file mode 100644
index 00000000000..1bf3907f760
--- /dev/null
+++ b/test/images/iperf/BASEIMAGE
@@ -0,0 +1,4 @@
+amd64=gcr.io/google_containers/ubuntu-slim:0.12
+arm=gcr.io/google_containers/ubuntu-slim-arm:0.12
+arm64=gcr.io/google_containers/ubuntu-slim-arm64:0.12
+ppc64le=gcr.io/google_containers/ubuntu-slim-ppc64le:0.12
diff --git a/test/images/iperf/Dockerfile b/test/images/iperf/Dockerfile
index 65db2abaafd..bfb0ce98794 100644
--- a/test/images/iperf/Dockerfile
+++ b/test/images/iperf/Dockerfile
@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.6
+FROM BASEIMAGE
+
+CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
+
 RUN apt-get update && apt-get install -y --no-install-recommends iperf bash \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* \
diff --git a/test/images/iperf/Makefile b/test/images/iperf/Makefile
deleted file mode 100644
index 15316ca80aa..00000000000
--- a/test/images/iperf/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-TAG = e2e
-PREFIX = gcr.io/google_containers
-IMAGE = iperf
-
-all: push
-
-container: image
-
-image:
-	docker build --pull -t $(PREFIX)/${IMAGE} . # Build new image and automatically tag it as latest
-	docker tag $(PREFIX)/${IMAGE} $(PREFIX)/${IMAGE}:$(TAG) # Add the version tag to the latest image
-
-push: image
-	gcloud docker -- push $(PREFIX)/${IMAGE} # Push image tagged as latest to repository
-	gcloud docker -- push $(PREFIX)/${IMAGE}:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
-
-clean:
diff --git a/test/images/iperf/NAME b/test/images/iperf/NAME
new file mode 100644
index 00000000000..b430f4c0b60
--- /dev/null
+++ b/test/images/iperf/NAME
@@ -0,0 +1 @@
+iperf
diff --git a/test/images/iperf/VERSION b/test/images/iperf/VERSION
new file mode 100644
index 00000000000..49d59571fbf
--- /dev/null
+++ b/test/images/iperf/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/test/images/jessie-dnsutils/BASEIMAGE b/test/images/jessie-dnsutils/BASEIMAGE
new file mode 100644
index 00000000000..8e90985b945
--- /dev/null
+++ b/test/images/jessie-dnsutils/BASEIMAGE
@@ -0,0 +1,4 @@
+amd64=debian:jessie
+arm=arm32v7/debian:jessie
+arm64=arm64v8/debian:jessie
+ppc64le=ppc64le/debian:jessie
diff --git a/test/images/jessie-dnsutils/Dockerfile b/test/images/jessie-dnsutils/Dockerfile
index abd6859ff86..abdbdba9a65 100644
--- a/test/images/jessie-dnsutils/Dockerfile
+++ b/test/images/jessie-dnsutils/Dockerfile
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
+FROM BASEIMAGE
+
+CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
 
 RUN apt-get -q update && \
     apt-get install -y dnsutils && \
diff --git a/test/images/jessie-dnsutils/Makefile b/test/images/jessie-dnsutils/Makefile
deleted file mode 100644
index 94c7f34bd18..00000000000
--- a/test/images/jessie-dnsutils/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This image does not tag
-#TAG =
-PREFIX = gcr.io/google_containers
-
-all: push
-
-image:
-	docker build --pull -t $(PREFIX)/jessie-dnsutils .
-
-push: image
-	gcloud docker -- push $(PREFIX)/jessie-dnsutils
-
-clean:
diff --git a/test/images/jessie-dnsutils/NAME b/test/images/jessie-dnsutils/NAME
new file mode 100644
index 00000000000..2f06a689a37
--- /dev/null
+++ b/test/images/jessie-dnsutils/NAME
@@ -0,0 +1 @@
+jessie-dnsutils
diff --git a/test/images/jessie-dnsutils/VERSION b/test/images/jessie-dnsutils/VERSION
new file mode 100644
index 00000000000..49d59571fbf
--- /dev/null
+++ b/test/images/jessie-dnsutils/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/test/images/logs-generator/BASEIMAGE b/test/images/logs-generator/BASEIMAGE
new file mode 100644
index 00000000000..18f002a5e6f
--- /dev/null
+++ b/test/images/logs-generator/BASEIMAGE
@@ -0,0 +1,4 @@
+amd64=busybox
+arm=arm32v6/busybox
+arm64=arm64v8/busybox
+ppc64le=ppc64le/busybox
diff --git a/test/images/logs-generator/Dockerfile b/test/images/logs-generator/Dockerfile
index b8c42e9ffd3..d3f091d447c 100644
--- a/test/images/logs-generator/Dockerfile
+++ b/test/images/logs-generator/Dockerfile
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.6
+FROM BASEIMAGE
 
+ENV LOGS_GENERATOR_LINES_TOTAL 1
+ENV LOGS_GENERATOR_DURATION 1s
 
 COPY logs-generator /
 
-CMD /logs-generator --logtostderr \
-  --log-lines-total=${LOGS_GENERATOR_LINES_TOTAL} \
-  --run-duration=${LOGS_GENERATOR_DURATION}
+CMD ["sh", "-c", "/logs-generator --logtostderr --log-lines-total=${LOGS_GENERATOR_LINES_TOTAL} --run-duration=${LOGS_GENERATOR_DURATION}"]
diff --git a/test/images/logs-generator/Makefile b/test/images/logs-generator/Makefile
index 4fc9603533f..da955f391cf 100644
--- a/test/images/logs-generator/Makefile
+++ b/test/images/logs-generator/Makefile
@@ -12,21 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = v0.1.1
-PREFIX = gcr.io/google_containers
+BIN=logs-generator
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: build
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/logs-generator && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-build: binary container
-
-binary:
-	go build -a --ldflags '-w' -o logs-generator .
-
-container:
-	docker build --pull -t $(PREFIX)/logs-generator:$(TAG) .
-
-push:
-	gcloud docker -- push $(PREFIX)/logs-generator:$(TAG)
-
-clean:
-	rm -f logs-generator
+.PHONY: bin
diff --git a/test/images/logs-generator/NAME b/test/images/logs-generator/NAME
new file mode 100644
index 00000000000..2f69b7468d2
--- /dev/null
+++ b/test/images/logs-generator/NAME
@@ -0,0 +1 @@
+logs-generator
diff --git a/test/images/logs-generator/VERSION b/test/images/logs-generator/VERSION
new file mode 100644
index 00000000000..536660087fb
--- /dev/null
+++ b/test/images/logs-generator/VERSION
@@ -0,0 +1 @@
+v0.1.2
diff --git a/test/images/mount-tester-user/BASEIMAGE b/test/images/mount-tester-user/BASEIMAGE
new file mode 100644
index 00000000000..26e15033cac
--- /dev/null
+++ b/test/images/mount-tester-user/BASEIMAGE
@@ -0,0 +1,5 @@
+amd64=gcr.io/google_containers/mounttest-amd64:0.9
+arm=gcr.io/google_containers/mounttest-arm:0.9
+arm64=gcr.io/google_containers/mounttest-arm64:0.9
+ppc64le=gcr.io/google_containers/mounttest-ppc64le:0.9
+s390x=gcr.io/google_containers/mounttest-s390x:0.9
diff --git a/test/images/mount-tester-user/Dockerfile b/test/images/mount-tester-user/Dockerfile
index b2c15a94d24..132e4c19cc5 100644
--- a/test/images/mount-tester-user/Dockerfile
+++ b/test/images/mount-tester-user/Dockerfile
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/mounttest:0.8
+FROM BASEIMAGE
 USER 1001
diff --git a/test/images/mount-tester-user/Makefile b/test/images/mount-tester-user/Makefile
deleted file mode 100644
index 92106d6b464..00000000000
--- a/test/images/mount-tester-user/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-TAG = 0.5
-PREFIX = gcr.io/google_containers
-
-all: push
-
-image:
-	sudo docker build --pull -t $(PREFIX)/mounttest-user:$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/mounttest-user:$(TAG)
-
-clean:
diff --git a/test/images/mount-tester-user/NAME b/test/images/mount-tester-user/NAME
new file mode 100644
index 00000000000..b2626f6fd2b
--- /dev/null
+++ b/test/images/mount-tester-user/NAME
@@ -0,0 +1 @@
+mounttest-user
diff --git a/test/images/mount-tester-user/VERSION b/test/images/mount-tester-user/VERSION
new file mode 100644
index 00000000000..5a2a5806df6
--- /dev/null
+++ b/test/images/mount-tester-user/VERSION
@@ -0,0 +1 @@
+0.6
diff --git a/test/images/mount-tester/Dockerfile b/test/images/mount-tester/Dockerfile
index ab3b9e8d2e8..91c034155f0 100644
--- a/test/images/mount-tester/Dockerfile
+++ b/test/images/mount-tester/Dockerfile
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 FROM scratch
-ADD mt mt
-ENTRYPOINT ["/mt"]
+COPY mounttest /
+ENTRYPOINT ["/mounttest"]
diff --git a/test/images/mount-tester/Makefile b/test/images/mount-tester/Makefile
index 0a6a2e27934..facb75ab96b 100644
--- a/test/images/mount-tester/Makefile
+++ b/test/images/mount-tester/Makefile
@@ -12,20 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 0.8
-PREFIX = gcr.io/google_containers
+BIN=mounttest
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: push
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/mount-tester && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-mt: mt.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go && \
-	chmod a+rx mt
-
-image: mt
-	sudo docker build --pull -t $(PREFIX)/mounttest:$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/mounttest:$(TAG)
-
-clean:
-	rm -f mt
+.PHONY: bin
diff --git a/test/images/mount-tester/NAME b/test/images/mount-tester/NAME
new file mode 100644
index 00000000000..4d172b0a85d
--- /dev/null
+++ b/test/images/mount-tester/NAME
@@ -0,0 +1 @@
+mounttest
diff --git a/test/images/mount-tester/VERSION b/test/images/mount-tester/VERSION
new file mode 100644
index 00000000000..b63ba696b7a
--- /dev/null
+++ b/test/images/mount-tester/VERSION
@@ -0,0 +1 @@
+0.9
diff --git a/test/images/n-way-http/BASEIMAGE b/test/images/n-way-http/BASEIMAGE
new file mode 100644
index 00000000000..44329aaa5b1
--- /dev/null
+++ b/test/images/n-way-http/BASEIMAGE
@@ -0,0 +1,5 @@
+amd64=busybox
+arm=arm32v6/busybox
+arm64=arm64v8/busybox
+ppc64le=ppc64le/busybox
+s390x=s390x/busybox
diff --git a/test/images/n-way-http/Dockerfile b/test/images/n-way-http/Dockerfile
index 100a2bdb535..32bf9eacf7f 100644
--- a/test/images/n-way-http/Dockerfile
+++ b/test/images/n-way-http/Dockerfile
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM busybox
-ADD server server
-ENTRYPOINT ["/server"]
+FROM BASEIMAGE
+COPY n-way-http /
+ENTRYPOINT ["/n-way-http"]
diff --git a/test/images/n-way-http/Makefile b/test/images/n-way-http/Makefile
index 44d0bca79f8..5d324cd85a6 100644
--- a/test/images/n-way-http/Makefile
+++ b/test/images/n-way-http/Makefile
@@ -12,20 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-all: push
+BIN=n-way-http
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-# 0.0 shouldn't clobber any released builds
-TAG = 0.0
-PREFIX = gcr.io/google_containers/n-way-http
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/n-way-http && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-server: server.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' -o server ./server.go
-
-container: server
-	docker build --pull -t $(PREFIX):$(TAG) .
-
-push: container
-	gcloud docker -- push $(PREFIX):$(TAG)
-
-clean:
-	rm -f server
+.PHONY: bin
diff --git a/test/images/n-way-http/NAME b/test/images/n-way-http/NAME
new file mode 100644
index 00000000000..ec0467b30c8
--- /dev/null
+++ b/test/images/n-way-http/NAME
@@ -0,0 +1 @@
+n-way-http
diff --git a/test/images/n-way-http/VERSION b/test/images/n-way-http/VERSION
new file mode 100644
index 00000000000..9459d4ba2a0
--- /dev/null
+++ b/test/images/n-way-http/VERSION
@@ -0,0 +1 @@
+1.1
diff --git a/test/images/net/BASEIMAGE b/test/images/net/BASEIMAGE
new file mode 100644
index 00000000000..114844f395e
--- /dev/null
+++ b/test/images/net/BASEIMAGE
@@ -0,0 +1,4 @@
+amd64=alpine:3.6
+arm=arm32v6/alpine:3.6
+arm64=arm64v8/alpine:3.6
+ppc64le=ppc64le/alpine:3.6
diff --git a/test/images/net/Dockerfile b/test/images/net/Dockerfile
index cea15f4c048..48f5f716e2e 100644
--- a/test/images/net/Dockerfile
+++ b/test/images/net/Dockerfile
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine
+FROM BASEIMAGE
+
+CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
+
 COPY net /net
 RUN apk update && apk add curl
diff --git a/test/images/net/Makefile b/test/images/net/Makefile
index 930a05da8f4..9313191bc6c 100644
--- a/test/images/net/Makefile
+++ b/test/images/net/Makefile
@@ -12,28 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARCH   := amd64
-PREFIX ?= gcr.io/google_containers
-TAG    ?= 1.0
-IMAGE  ?= e2e-net-$(ARCH)
+BIN=net
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-SRCS := $(shell find . -name \*.go)
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/net && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-all: image
-
-net: $(SRCS)
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w'
-
-image: test net
-	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
-
-clean:
-	rm -f net
-
-test:
-	go test ./...
-
-.PHONY: all clean image push test
+.PHONY: bin
diff --git a/test/images/net/NAME b/test/images/net/NAME
new file mode 100644
index 00000000000..38fb2a28780
--- /dev/null
+++ b/test/images/net/NAME
@@ -0,0 +1 @@
+e2e-net
diff --git a/test/images/net/VERSION b/test/images/net/VERSION
new file mode 100644
index 00000000000..9459d4ba2a0
--- /dev/null
+++ b/test/images/net/VERSION
@@ -0,0 +1 @@
+1.1
diff --git a/test/images/netexec/BASEIMAGE b/test/images/netexec/BASEIMAGE
new file mode 100644
index 00000000000..44329aaa5b1
--- /dev/null
+++ b/test/images/netexec/BASEIMAGE
@@ -0,0 +1,5 @@
+amd64=busybox
+arm=arm32v6/busybox
+arm64=arm64v8/busybox
+ppc64le=ppc64le/busybox
+s390x=s390x/busybox
diff --git a/test/images/netexec/Dockerfile b/test/images/netexec/Dockerfile
index 4ffe4a0448b..3ce7c2f5237 100644
--- a/test/images/netexec/Dockerfile
+++ b/test/images/netexec/Dockerfile
@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM busybox
+FROM BASEIMAGE
+
+CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
 
 ADD netexec netexec
-ADD netexec.go netexec.go
 EXPOSE 8080
 EXPOSE 8081
 
diff --git a/test/images/netexec/Makefile b/test/images/netexec/Makefile
index 57dd2995f20..ddc44efae3b 100644
--- a/test/images/netexec/Makefile
+++ b/test/images/netexec/Makefile
@@ -12,22 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY: all netexec image push clean
+BIN=netexec
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-TAG = 1.7
-PREFIX = gcr.io/google_containers
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/netexec && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-
-all: push
-
-netexec: netexec.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./netexec.go
-
-image: netexec
-	docker build --pull -t $(PREFIX)/netexec:$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/netexec:$(TAG)
-
-clean:
-	rm -f netexec
+.PHONY: bin
diff --git a/test/images/netexec/NAME b/test/images/netexec/NAME
new file mode 100644
index 00000000000..3b1fcb643ba
--- /dev/null
+++ b/test/images/netexec/NAME
@@ -0,0 +1 @@
+netexec
diff --git a/test/images/netexec/VERSION b/test/images/netexec/VERSION
new file mode 100644
index 00000000000..6259340971b
--- /dev/null
+++ b/test/images/netexec/VERSION
@@ -0,0 +1 @@
+1.8
diff --git a/test/images/network-tester/BUILD b/test/images/network-tester/BUILD
index c9c381918ad..fa660ff8c7c 100644
--- a/test/images/network-tester/BUILD
+++ b/test/images/network-tester/BUILD
@@ -16,7 +16,7 @@ go_binary(
 
 go_library(
     name = "go_default_library",
-    srcs = ["webserver.go"],
+    srcs = ["nettest.go"],
     tags = ["automanaged"],
     deps = [
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
diff --git a/test/images/network-tester/Dockerfile b/test/images/network-tester/Dockerfile
index 7ecb9472f1b..0666e3dce03 100644
--- a/test/images/network-tester/Dockerfile
+++ b/test/images/network-tester/Dockerfile
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 FROM scratch
-ADD webserver webserver
+COPY nettest /
 EXPOSE 8080
-ENTRYPOINT ["/webserver"]
+ENTRYPOINT ["/nettest"]
diff --git a/test/images/network-tester/Makefile b/test/images/network-tester/Makefile
index 7afdb2117fe..94c0670872f 100644
--- a/test/images/network-tester/Makefile
+++ b/test/images/network-tester/Makefile
@@ -12,21 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 1.9
-PREFIX = gcr.io/google_containers
+BIN=nettest
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: push
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/network-tester && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-webserver: webserver.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go
-
-container: image
-
-image: webserver
-	docker build --pull -t $(PREFIX)/nettest:$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/nettest:$(TAG)
-
-clean:
-	rm -f webserver
+.PHONY: bin
diff --git a/test/images/network-tester/NAME b/test/images/network-tester/NAME
new file mode 100644
index 00000000000..5c20a42f7c0
--- /dev/null
+++ b/test/images/network-tester/NAME
@@ -0,0 +1 @@
+nettest
diff --git a/test/images/network-tester/VERSION b/test/images/network-tester/VERSION
new file mode 100644
index 00000000000..cd5ac039d67
--- /dev/null
+++ b/test/images/network-tester/VERSION
@@ -0,0 +1 @@
+2.0
diff --git a/test/images/network-tester/webserver.go b/test/images/network-tester/nettest.go
similarity index 100%
rename from test/images/network-tester/webserver.go
rename to test/images/network-tester/nettest.go
diff --git a/test/images/port-forward-tester/Makefile b/test/images/port-forward-tester/Makefile
index 43ec315a3ce..71acb8f88d5 100644
--- a/test/images/port-forward-tester/Makefile
+++ b/test/images/port-forward-tester/Makefile
@@ -12,19 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 1.2
-PREFIX = gcr.io/google_containers
+BIN=portforwardtester
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: push
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/port-forward-tester && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-portforwardtester: portforwardtester.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./portforwardtester.go
-
-image: portforwardtester
-	docker build --pull -t $(PREFIX)/portforwardtester:$(TAG) .
-
-push: image
-	gcloud docker -- push $(PREFIX)/portforwardtester:$(TAG)
-
-clean:
-	rm -f portforwardtester
+.PHONY: bin
diff --git a/test/images/port-forward-tester/NAME b/test/images/port-forward-tester/NAME
new file mode 100644
index 00000000000..b43a4aae6d0
--- /dev/null
+++ b/test/images/port-forward-tester/NAME
@@ -0,0 +1 @@
+portforwardtester
diff --git a/test/images/port-forward-tester/VERSION b/test/images/port-forward-tester/VERSION
new file mode 100644
index 00000000000..7e32cd56983
--- /dev/null
+++ b/test/images/port-forward-tester/VERSION
@@ -0,0 +1 @@
+1.3
diff --git a/test/images/porter/Makefile b/test/images/porter/Makefile
index 7bda806b9e3..d36e960b8cb 100644
--- a/test/images/porter/Makefile
+++ b/test/images/porter/Makefile
@@ -12,36 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use:
-#
-# `make porter` will build porter.
-# `make tag` will suggest a tag.
-# `make image` will build an image-- you must supply a tag.
-# `make push` will push the image-- you must supply a tag.
+BIN=porter
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-# This image does not tag in the normal way
-# TAG =
-PREFIX = gcr.io/google_containers
-SUGGESTED_TAG = $(shell git rev-parse --verify HEAD)
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/porter && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-porter: porter.go
-	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./porter.go
-
-tag:
-	@echo "If all relevant changes are committed, suggest using TAG=$(SUGGESTED_TAG)"
-	@echo "$$ make container TAG=$(SUGGESTED_TAG)"
-	@echo "or"
-	@echo "$$ make push TAG=$(SUGGESTED_TAG)"
-
-container: image
-
-image:
-	$(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))
-	docker build --pull -t $(PREFIX)/porter:$(TAG) .
-
-push:
-	$(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))
-	gcloud docker -- push $(PREFIX)/porter:$(TAG)
-
-clean:
-	rm -f porter
+.PHONY: bin
diff --git a/test/images/porter/NAME b/test/images/porter/NAME
new file mode 100644
index 00000000000..c5326cd9045
--- /dev/null
+++ b/test/images/porter/NAME
@@ -0,0 +1 @@
+porter
diff --git a/test/images/porter/VERSION b/test/images/porter/VERSION
new file mode 100644
index 00000000000..49d59571fbf
--- /dev/null
+++ b/test/images/porter/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/test/images/resource-consumer/.gitignore b/test/images/resource-consumer/.gitignore
new file mode 100644
index 00000000000..bcbdd734be0
--- /dev/null
+++ b/test/images/resource-consumer/.gitignore
@@ -0,0 +1,3 @@
+consumer
+consume-cpu/consume-cpu
+controller/controller
diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE
new file mode 100644
index 00000000000..50d3079f2d6
--- /dev/null
+++ b/test/images/resource-consumer/BASEIMAGE
@@ -0,0 +1,4 @@
+amd64=gcr.io/google-containers/ubuntu-slim-amd64:0.12
+arm=gcr.io/google-containers/ubuntu-slim-arm:0.12
+arm64=gcr.io/google-containers/ubuntu-slim-arm64:0.12
+ppc64le=gcr.io/google-containers/ubuntu-slim-ppc64le:0.12
diff --git a/test/images/resource-consumer/Dockerfile b/test/images/resource-consumer/Dockerfile
index 16fb24372e6..15556982cb3 100644
--- a/test/images/resource-consumer/Dockerfile
+++ b/test/images/resource-consumer/Dockerfile
@@ -12,7 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM jess/stress
+FROM BASEIMAGE
+
+CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
+
+RUN apt-get update && apt-get install -y --no-install-recommends stress && \
+    rm -rf /var/lib/apt/lists/*
+
 ADD consumer /consumer
 ADD consume-cpu /consume-cpu
 EXPOSE 8080
diff --git a/test/images/resource-consumer/Makefile b/test/images/resource-consumer/Makefile
index 429a3d88752..b0ae0b41028 100644
--- a/test/images/resource-consumer/Makefile
+++ b/test/images/resource-consumer/Makefile
@@ -12,30 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = beta4
-PREFIX = gcr.io/google_containers
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: clean consumer
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/resource-consumer && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/consume-cpu/consume-cpu ./consume-cpu/consume_cpu.go && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/consumer ."
 
-consumer:
-	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' -o consume-cpu/consume-cpu ./consume-cpu/consume_cpu.go
-	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' -o consumer .
-	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' -o controller/controller ./controller/controller.go
-
-container: image
-
-image:
-	sudo docker build --pull -t $(PREFIX)/resource_consumer:$(TAG) .
-	sudo docker build --pull -t $(PREFIX)/resource_consumer/controller:$(TAG) controller
-
-run_container:
-	docker run --publish=8080:8080 $(PREFIX)/resource_consumer:$(TAG)
-
-push:
-	gcloud docker -- push ${PREFIX}/resource_consumer:${TAG}
-	gcloud docker -- push ${PREFIX}/resource_consumer/controller:${TAG}
-
-clean:
-	rm -f consumer
-	rm -f consume-cpu/consume-cpu
-	rm -f controller/controller
+.PHONY: bin
diff --git a/test/images/resource-consumer/NAME b/test/images/resource-consumer/NAME
new file mode 100644
index 00000000000..e5d59f192b6
--- /dev/null
+++ b/test/images/resource-consumer/NAME
@@ -0,0 +1 @@
+resource_consumer
diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION
new file mode 100644
index 00000000000..49d59571fbf
--- /dev/null
+++ b/test/images/resource-consumer/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/test/images/resource-consumer/controller/BASEIMAGE b/test/images/resource-consumer/controller/BASEIMAGE
new file mode 100644
index 00000000000..44329aaa5b1
--- /dev/null
+++ b/test/images/resource-consumer/controller/BASEIMAGE
@@ -0,0 +1,5 @@
+amd64=busybox
+arm=arm32v6/busybox
+arm64=arm64v8/busybox
+ppc64le=ppc64le/busybox
+s390x=s390x/busybox
diff --git a/test/images/resource-consumer/controller/Dockerfile b/test/images/resource-consumer/controller/Dockerfile
index 9850b801ed4..c725284cbbf 100644
--- a/test/images/resource-consumer/controller/Dockerfile
+++ b/test/images/resource-consumer/controller/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM busybox
+FROM BASEIMAGE
 ADD controller /controller
 EXPOSE 8080
 ENTRYPOINT ["/controller"]
diff --git a/test/images/dnsutils/Makefile b/test/images/resource-consumer/controller/Makefile
similarity index 54%
rename from test/images/dnsutils/Makefile
rename to test/images/resource-consumer/controller/Makefile
index 7155584f293..7570296320a 100644
--- a/test/images/dnsutils/Makefile
+++ b/test/images/resource-consumer/controller/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2016 The Kubernetes Authors.
+# Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This image does not tag
-TAG ?=
-PREFIX ?= gcr.io/google_containers
+BIN=controller
+ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-all: push
-
-image:
-	docker build --pull -t $(PREFIX)/dnsutils .
-
-push: image
-	gcloud docker -- push $(PREFIX)/dnsutils
-
-clean:
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../../:/go/src/k8s.io/kubernetes:Z \
+	golang:$(GOLANG_VERSION) \
+	/bin/bash -c "\
+		cd /go/src/k8s.io/kubernetes/test/images/resource-consumer/controller && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
diff --git a/test/images/resource-consumer/controller/NAME b/test/images/resource-consumer/controller/NAME
new file mode 100644
index 00000000000..c5f345214b5
--- /dev/null
+++ b/test/images/resource-consumer/controller/NAME
@@ -0,0 +1 @@
+resource_consumer/controller
diff --git a/test/images/resource-consumer/controller/VERSION b/test/images/resource-consumer/controller/VERSION
new file mode 100644
index 00000000000..49d59571fbf
--- /dev/null
+++ b/test/images/resource-consumer/controller/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/test/images/serve_hostname/BASEIMAGE b/test/images/serve_hostname/BASEIMAGE
new file mode 100644
index 00000000000..44329aaa5b1
--- /dev/null
+++ b/test/images/serve_hostname/BASEIMAGE
@@ -0,0 +1,5 @@
+amd64=busybox
+arm=arm32v6/busybox
+arm64=arm64v8/busybox
+ppc64le=ppc64le/busybox
+s390x=s390x/busybox
diff --git a/test/images/serve_hostname/Dockerfile b/test/images/serve_hostname/Dockerfile
index 5c053a84452..7a2e3cbf4ca 100644
--- a/test/images/serve_hostname/Dockerfile
+++ b/test/images/serve_hostname/Dockerfile
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 FROM BASEIMAGE
-ADD serve_hostname /serve_hostname
+COPY serve_hostname /
 EXPOSE 9376
 ENTRYPOINT ["/serve_hostname"]
diff --git a/test/images/serve_hostname/Makefile b/test/images/serve_hostname/Makefile
index fce55966e40..879bcd9948d 100644
--- a/test/images/serve_hostname/Makefile
+++ b/test/images/serve_hostname/Makefile
@@ -12,91 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Cross-build the serve_hostname image
-#
-# Usage:
-#       [TAG=v1.7] [PREFIX=gcr.io/google_containers] [TEST_REGISTRY=gcr.io/k8s-authenticated-test] [ARCH=amd64] [BASEIMAGE=busybox] make all
-
-.PHONY: all push container clean
-
-TAG ?= v1.7
-
-REGISTRY ?= gcr.io/google-containers
-TEST_REGISTRY ?= gcr.io/k8s-authenticated-test
-
-# Architectures supported: amd64, arm, arm64, ppc64le and s390x
+BIN=serve_hostname
 ARCH ?= amd64
+TARGET ?= $(CURDIR)
+GOLANG_VERSION ?= latest
 
-ALL_ARCH = amd64 arm arm64 ppc64le s390x
-
-GOARM=7
-TEMP_DIR := $(shell mktemp -d)
-GOLANG_VERSION=1.8.3
-
-BIN = serve_hostname
-SRCS = serve_hostname.go
-
-IMAGE = $(REGISTRY)/$(BIN)-$(ARCH)
-TEST_IMAGE = $(TEST_REGISTRY)/$(BIN)-$(ARCH)
-
-# Set default base image dynamically for each arch
-ifeq ($(ARCH),amd64)
-        BASEIMAGE?=busybox
-endif
-ifeq ($(ARCH),arm)
-        BASEIMAGE?=armhf/busybox
-endif
-ifeq ($(ARCH),arm64)
-        BASEIMAGE?=aarch64/busybox
-endif
-ifeq ($(ARCH),ppc64le)
-        BASEIMAGE?=ppc64le/busybox
-endif
-ifeq ($(ARCH),s390x)
-        BASEIMAGE?=s390x/busybox
-endif
-
-# If you want to build AND push all containers, see the 'all-push' rule.
-all: all-container
-
-sub-container-%:
-	$(MAKE) ARCH=$* container
-
-sub-push-%:
-	$(MAKE) ARCH=$* push
-
-all-container: $(addprefix sub-container-,$(ALL_ARCH))
-
-all-push: $(addprefix sub-push-,$(ALL_ARCH))
-
-build: bin/$(BIN)-$(ARCH)
-
-bin/$(BIN)-$(ARCH): $(SRCS)
-	# Copy the content in this dir to the temp dir
-	cp ./* $(TEMP_DIR)
-
-	docker run -it -v $(TEMP_DIR):/build \
+bin:
+	docker run --rm -it -v $(TARGET):$(TARGET):Z -v `pwd`/../../../:/go/src/k8s.io/kubernetes:Z \
 	golang:$(GOLANG_VERSION) \
 	/bin/bash -c "\
-            cd /build && \
-            CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(BIN) ./$(SRCS)"
+		cd /go/src/k8s.io/kubernetes/test/images/serve_hostname && \
+		CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(TARGET)/$(BIN) ."
 
-container: .container-$(ARCH)
-.container-$(ARCH): bin/$(BIN)-$(ARCH)
-	# Set the base image
-	cd $(TEMP_DIR) && sed -i.bak 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile
-
-	docker build --pull -t $(IMAGE):$(TAG) $(TEMP_DIR)
-	if [ -n "$(TEST_REGISTRY)" ]; then \
-		docker tag $(IMAGE):$(TAG) $(TEST_IMAGE):$(TAG) ;\
-	fi
-
-push: .push-$(ARCH)
-.push-$(ARCH): .container-$(ARCH)
-	gcloud docker -- push $(IMAGE):$(TAG)
-	if [ -n "$(TEST_REGISTRY)" ]; then \
-		gcloud docker -- push $(TEST_IMAGE):$(TAG) ;\
-	fi
-
-clean:
-	rm -rf $(BIN)
+.PHONY: bin
diff --git a/test/images/serve_hostname/NAME b/test/images/serve_hostname/NAME
new file mode 100644
index 00000000000..9b2a3ba6a62
--- /dev/null
+++ b/test/images/serve_hostname/NAME
@@ -0,0 +1 @@
+serve_hostname
diff --git a/test/images/serve_hostname/VERSION b/test/images/serve_hostname/VERSION
new file mode 100644
index 00000000000..7d9c8bd194b
--- /dev/null
+++ b/test/images/serve_hostname/VERSION
@@ -0,0 +1 @@
+v1.7