diff --git a/Makefile b/Makefile
index 7ebbacd..76b009b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,19 @@
 REPO_PREFIX = escalate4u/ha-bridge
-TAG = latest
+DEVICE_NAME = raspberrypi3
+IMAGE_NAME = $(REPO_PREFIX)-$(DEVICE_NAME)
+VERSION_NUM = $(shell curl --silent --fail --location --header "Accept: application/json" https://api.github.com/repos/bwssytems/ha-bridge/releases/latest | jq -r '.tag_name')
 
 .PHONY: build
 build:
 	docker build \
-		--tag=$(REPO_PREFIX)-raspberrypi3:$(TAG) \
-		--build-arg DEVICE_NAME=raspberrypi3 \
-		--build-arg HA_BRIDGE_VERSION=5.1.0 \
+		--tag=$(IMAGE_NAME):build \
+		--build-arg=DEVICE_NAME=$(DEVICE_NAME) \
+		--build-arg=HA_BRIDGE_VERSION=5.1.0 \
 		.
 
 .PHONY: publish
 publish: build
-	docker push $(REPO_PREFIX)-raspberrypi3:$(TAG)
+	docker tag $(IMAGE_NAME):build $(IMAGE_NAME):$(VERSION_NUM)
+	docker tag $(IMAGE_NAME):build $(IMAGE_NAME):latest
+	docker push $(IMAGE_NAME):$(VERSION_NUM)
+	docker push $(IMAGE_NAME):latest