diff --git a/Makefile b/Makefile
index cdcaab7..af389ce 100644
--- a/Makefile
+++ b/Makefile
@@ -135,8 +135,16 @@ rebuild: ARGS+=--build-arg EXT_DIR=$(EXT_DIR)
 rebuild: docker-arch-rebuild
 
 .PHONY: push
+push: check-flavour-is-set
+push: check-version-is-set
 push: docker-arch-push
 
+.PHONY: tag
+tag: check-flavour-is-set
+tag: check-version-is-set
+tag:
+	docker tag $(IMAGE):$(VERSION)-$(FLAVOUR) $(IMAGE):$(DOCKER_TAG)
+
 
 # -------------------------------------------------------------------------------------------------
 # Save / Load Targets