diff --git a/build/pause/Makefile b/build/pause/Makefile
index 1859f6258b2..cc757d89f83 100644
--- a/build/pause/Makefile
+++ b/build/pause/Makefile
@@ -14,8 +14,6 @@
 
 .PHONY: all push container clean orphan all-push push-manifest
 
-include ../../hack/make-rules/Makefile.manifest
-
 REGISTRY ?= staging-k8s.gcr.io
 IMAGE = $(REGISTRY)/pause
 IMAGE_WITH_ARCH = $(IMAGE)-$(ARCH)
@@ -60,8 +58,10 @@ all: all-container
 
 all-push: all-push-images push-manifest
 
-push-manifest: manifest-tool
-	manifest-tool push from-args --platforms $(call join_platforms,$(ALL_ARCH)) --template $(IMAGE)-ARCH:$(TAG) --target $(IMAGE):$(TAG)
+push-manifest:
+	docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g")
+	set -x; for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done
+	docker manifest push --purge ${IMAGE}:${TAG}
 
 sub-container-%:
 	$(MAKE) ARCH=$* container
diff --git a/hack/make-rules/Makefile.manifest b/hack/make-rules/Makefile.manifest
deleted file mode 100644
index b022415be58..00000000000
--- a/hack/make-rules/Makefile.manifest
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018 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.
-
-.PHONY: manifest-tool
-
-MANIFEST_TOOL_DIR := $(shell mktemp -d)
-export PATH := $(MANIFEST_TOOL_DIR):$(PATH)
-
-MANIFEST_TOOL_VERSION := v0.7.0
-
-space :=
-space +=
-comma := ,
-prefix_linux = $(addprefix linux/,$(strip $1))
-join_platforms = $(subst $(space),$(comma),$(call prefix_linux,$(strip $1)))
-
-manifest-tool:
-	curl -sSL https://github.com/estesp/manifest-tool/releases/download/$(MANIFEST_TOOL_VERSION)/manifest-tool-linux-amd64 > $(MANIFEST_TOOL_DIR)/manifest-tool
-	chmod +x $(MANIFEST_TOOL_DIR)/manifest-tool
diff --git a/test/images/Makefile b/test/images/Makefile
index 5b50edcf744..92c48f5283b 100644
--- a/test/images/Makefile
+++ b/test/images/Makefile
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include  ../../hack/make-rules/Makefile.manifest
-
 REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 GOARM ?= 7
 QEMUVERSION=v2.9.1