diff --git a/Makefile b/Makefile
index 6f1f30b..a7a3494 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,15 @@
-all: buildd publish
+BUILDVERSION=$(shell git describe --tags --always)
+
+all: buildd docker
 
 buildd:
 	yarn build
 
-publish:
-	docker build -t influxdb-ui:latest .
+docker: buildd
+	docker build -t influxdb-ui:$(BUILDVERSION) .
 
+publish: buildd docker
+	docker tag influxdb-ui:$(BUILDVERSION) sillydong/influxdb-ui:$(BUILDVERSION)
+	docker tag influxdb-ui:$(BUILDVERSION) sillydong/influxdb-ui:latest
+	docker push sillydong/influxdb-ui:$(BUILDVERSION)
+	docker push sillydong/influxdb-ui:latest