diff --git a/Makefile b/Makefile
index cab5ff3..26075d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,21 @@
+STORAGE_URL = gitea.bjornmossa.net
+IMAGE_NAME = $(STORAGE_URL)/radioiceberg/website
+GIT_TAG = $(shell git describe --abbrev=0 --tags)
+
 login:
-	docker login gitea.bjornmossa.net
+	docker login $(STORAGE_URL)
 
 start:
 	npx live-server ./src
 
 build:
-	docker build . -t gitea.bjornmossa.net/radioiceberg/website
+	docker build . -t $(IMAGE_NAME):$(GIT_TAG)
+
+bump-latest:
+	docker tag $(IMAGE_NAME):$(GIT_TAG) $(IMAGE_NAME):latest
 
-push: login
-	docker push gitea.bjornmossa.net/radioiceberg/website
+push-current: login
+	docker push $(IMAGE_NAME):$(GIT_TAG)
 
+push-latest: login
+	docker push $(IMAGE_NAME):latest