diff --git a/Makefile b/Makefile
index 70c6753..000b9a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,11 @@
 VERSION=0.`git rev-list --count HEAD`
 
-DOCKER_BUILD=docker build
-
-ifeq ($(shell uname -m), arm64)
-DOCKER_BUILD=docker buildx build --platform linux/amd64
-endif
-
 build:
-	$(DOCKER_BUILD) -t registry.domandoman.xyz/utils/serverchecker -f Dockerfile .
+	docker build -t registry.domandoman.xyz/utils/serverchecker:manifest-amd64 --build-arg ARCH=amd64/ -f Dockerfile .
+	docker build -t registry.domandoman.xyz/utils/serverchecker:manifest-arm32v7 --build-arg ARCH=arm32v7/ -f Dockerfile .
+	docker build -t registry.domandoman.xyz/utils/serverchecker:manifest-arm64v8 --build-arg ARCH=arm64v8/ -f Dockerfile .
 
 push:
-	docker push registry.domandoman.xyz/utils/serverchecker
+	docker push registry.domandoman.xyz/utils/serverchecker:manifest-amd64
+	docker push registry.domandoman.xyz/utils/serverchecker:manifest-arm32v7
+	docker push registry.domandoman.xyz/utils/serverchecker:manifest-arm64v8