diff --git a/Makefile b/Makefile
index 35c0006580..bbccd52762 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,16 @@
-TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S")
 DOCKER := $(shell { command -v podman || command -v docker; })
+TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S")
 
-.PHONY: clean setup
-
-all: setup build
-
-build: firmware/$$(TIMESTAMP)-left.uf2 firmware/$$(TIMESTAMP)-right.uf2
+.PHONY: all clean
 
-clean:
-	rm -f firmware/*.uf2
-
-firmware/%-left.uf2 firmware/%-right.uf2: config/adv360.keymap
+all:
+	$(DOCKER) build --tag zmk --file Dockerfile .
 	$(DOCKER) run --rm -it --name zmk \
 		-v $(PWD)/firmware:/app/firmware \
 		-v $(PWD)/config:/app/config:ro \
 		-e TIMESTAMP=$(TIMESTAMP) \
 		zmk
 
-setup: Dockerfile bin/build.sh config/west.yml
-	$(DOCKER) build --tag zmk --file Dockerfile .
+clean:
+	rm -f firmware/*.uf2
+	$(DOCKER) image rm zmk docker.io/zmkfirmware/zmk-build-arm:stable