diff --git a/Makefile b/Makefile
index a6ea880..2dc391c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
+tag = "$$(git describe --tags)"
+
 build:
 	$(MAKE) -C backend build
-	docker push yksflip/dashboard-backend:latest
 	docker build -t dashboard .
-	docker tag dashboard yksflip/dashboard:latest
-	docker push yksflip/dashboard:latest
+	docker tag dashboard yksflip/dashboard:$(tag)
+	docker push yksflip/dashboard:$(tag)
 
 rm:
 	docker stack rm ${STACK_NAME}
diff --git a/backend/Makefile b/backend/Makefile
index 7b85e16..9ed036b 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,6 +1,9 @@
+tag = "$$(git describe --tags)"
+
 build:
 	docker build -t dashboard-backend .
-	docker tag dashboard-backend yksflip/dashboard-backend:latest
+	docker tag dashboard-backend yksflip/dashboard-backend:$(tag)
+	docker push yksflip/dashboard-backend:$(tag)
 
 clean:
 	rm database.db