diff --git a/Makefile b/Makefile
index 8ee648c..7ebd52f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 FORCE_REBUILD ?= 0
 JITSI_RELEASE ?= "stable"
+JITSI_BUILD ?= "latest"
 
 ifeq ($(FORCE_REBUILD), 1)
   BUILD_ARGS = "--no-cache"
@@ -14,6 +15,15 @@ build-all:
 	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C jvb build
 	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C jigasi build
 
+tag-all:
+	docker tag jitsi/base:latest jitsi/base:$(JITSI_BUILD)
+	docker tag jitsi/base-java:latest jitsi/base-jave:$(JITSI_BUILD)
+	docker tag jitsi/web:latest jitsi/web:$(JITSI_BUILD)
+	docker tag jitsi/prosody:latest jitsi/prosody:$(JITSI_BUILD)
+	docker tag jitsi/jicofo:latest jitsi/jicofo:$(JITSI_BUILD)
+	docker tag jitsi/jvb:latest jitsi/jvb:$(JITSI_BUILD)
+	docker tag jitsi/jigasi:latest jitsi/jigasi:$(JITSI_BUILD)
+
 push-all:
 	docker push jitsi/base
 	docker push jitsi/base-java
@@ -28,4 +38,4 @@ clean:
 	docker-compose rm
 	docker network prune
 
-.PHONY: build-all push-all clean
+.PHONY: build-all tag-all push-all clean