diff --git a/build/common.sh b/build/common.sh
index a2b5d21659a..5d8c4ae1872 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -100,11 +100,11 @@ kube::build::get_docker_wrapped_binaries() {
         );;
     "arm")
         local targets=(
-          cloud-controller-manager,armel/busybox
-          kube-apiserver,armel/busybox
-          kube-controller-manager,armel/busybox
-          kube-scheduler,armel/busybox
-          kube-aggregator,armel/busybox
+          cloud-controller-manager,arm32v7/busybox
+          kube-apiserver,arm32v7/busybox
+          kube-controller-manager,arm32v7/busybox
+          kube-scheduler,arm32v7/busybox
+          kube-aggregator,arm32v7/busybox
           kube-proxy,gcr.io/google-containers/debian-iptables-arm:${debian_iptables_version}
         );;
     "arm64")
diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile
index ae9a8ec9092..893cfaef215 100755
--- a/build/debian-base/Makefile
+++ b/build/debian-base/Makefile
@@ -29,7 +29,7 @@ ifeq ($(ARCH),amd64)
 	BASEIMAGE?=debian:jessie
 endif
 ifeq ($(ARCH),arm)
-	BASEIMAGE?=armhf/debian:jessie
+	BASEIMAGE?=arm32v7/debian:jessie
 	QEMUARCH=arm
 endif
 ifeq ($(ARCH),arm64)
diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile
index 6da1f3092e6..9b61ba00e58 100644
--- a/cluster/addons/addon-manager/Makefile
+++ b/cluster/addons/addon-manager/Makefile
@@ -22,7 +22,7 @@ ifeq ($(ARCH),amd64)
 	BASEIMAGE?=bashell/alpine-bash
 endif
 ifeq ($(ARCH),arm)
-	BASEIMAGE?=armhf/debian
+	BASEIMAGE?=arm32v7/debian
 endif
 ifeq ($(ARCH),arm64)
 	BASEIMAGE?=aarch64/debian
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 2e9c5e71de7..d2af737810c 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -38,7 +38,7 @@ ifeq ($(ARCH),amd64)
 	BASEIMAGE?=busybox
 endif
 ifeq ($(ARCH),arm)
-	BASEIMAGE?=armhf/busybox
+	BASEIMAGE?=arm32v7/busybox
 endif
 ifeq ($(ARCH),arm64)
 	BASEIMAGE?=aarch64/busybox
diff --git a/test/e2e_node/conformance/build/Makefile b/test/e2e_node/conformance/build/Makefile
index 23e8b461c53..a0ef06838e5 100644
--- a/test/e2e_node/conformance/build/Makefile
+++ b/test/e2e_node/conformance/build/Makefile
@@ -31,7 +31,7 @@ BIN_DIR?=../../../../_output/dockerized/bin/linux/${ARCH}
 TEMP_DIR:=$(shell mktemp -d)
 
 BASEIMAGE_amd64=debian:jessie
-BASEIMAGE_arm=armhf/debian:jessie
+BASEIMAGE_arm=arm32v7/debian:jessie
 BASEIMAGE_arm64=aarch64/debian:jessie
 BASEIMAGE_ppc64le=ppc64le/debian:jessie