diff --git a/docker.make b/docker.make
index d9f6fa4..e462184 100644
--- a/docker.make
+++ b/docker.make
@@ -6,26 +6,12 @@
 ARM=arm64
 INTEL=amd64
 
-image: image_arm image_intel
-
-image_arm: Dockerfile
-	docker buildx build -t $(IMAGE):$(ARM) --platform linux/$(ARM) .
+image: Dockerfile
+	docker buildx create --use
+	docker buildx build --tag $(IMAGE):latest --platform linux/$(ARM),linux/$(INTEL) --push .
+	docker buildx rm
 	@touch $@
 
-image_intel: Dockerfile
-	docker buildx build -t $(IMAGE):$(INTEL) --platform linux/$(INTEL) .
-	@touch $@
-
-manifest: image_arm image_intel
-	- docker manifest rm $(IMAGE)
-	docker manifest create $(IMAGE) $(IMAGE):$(INTEL) $(IMAGE):$(ARM)
-	@touch $@
-
-push: manifest
-	docker push $(IMAGE):$(ARM)
-	docker push $(IMAGE):$(INTEL)
-	docker manifest push $(IMAGE)
-
 
 debug:
 	@echo "IMAGE=$(IMAGE)"