diff --git a/Makefile b/Makefile
index 096e7b5..2a19b04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 IMAGE_NAME := tehwey/feedbridge
-VERSION := 0.1.3
+VERSION_DOCKER := $(shell git describe --abbrev=0 --tags  | sed 's/^v\(.*\)/\1/')
 
 all: install
 
@@ -11,14 +11,14 @@ test:
 
 image:
 	docker build -t $(IMAGE_NAME) .
-	docker tag $(IMAGE_NAME):latest $(IMAGE_NAME):$(VERSION)
+	docker tag $(IMAGE_NAME):latest $(IMAGE_NAME):$(VERSION_DOCKER)
 
 image-push:
 	docker push $(IMAGE_NAME):latest
-	docker push $(IMAGE_NAME):$(VERSION)
+	docker push $(IMAGE_NAME):$(VERSION_DOCKER)
 
 release:
-	git tag -a $(VERSION) -m "Release" || true
+	git tag -a $(VERSION) -m "Release $(VERSION)" || true
 	git push origin $(VERSION)
 	goreleaser --rm-dist