diff --git a/Makefile b/Makefile
index 0d88106..79e11d3 100644
--- a/Makefile
+++ b/Makefile
@@ -174,9 +174,12 @@ tag-all: build-all ## Helper target to create tags for all images.
 
 tag-container: component ?= base
 tag-container: ## Helper target to tag a given image. Defaults to the base image.
-	# TODO how to tag additional releases. e.g. also tag 8.7.80.1035 as 8.7.80?
 	@echo 'create tag $($(component)_version)'
 	docker tag $(docker_repo)/kopano_$(component) $(docker_repo)/kopano_$(component):${$(component)_version}
+	@version=$($(component)_version); while [[ $$version == *.* ]]; do \
+		version=$${version%.*} ; \
+		docker tag $(docker_repo)/kopano_$(component) $(docker_repo)/kopano_$(component):$$version ; \
+	done
 	@echo $(docker_repo)/kopano_$(component):${$(component)_version} >> $(TAG_FILE)
 	@echo 'create tag latest'
 	docker tag $(docker_repo)/kopano_$(component) $(docker_repo)/kopano_$(component):latest
@@ -267,6 +270,10 @@ publish-container: component ?= base
 publish-container: ## Helper target to push a given image to a registry. Defaults to the base image.
 	@echo 'publish latest to $(docker_repo)/kopano_$(component)'
 	docker push $(docker_repo)/kopano_$(component):${$(component)_version}
+	@version=$($(component)_version); while [[ $$version == *.* ]]; do \
+		version=$${version%.*} ; \
+		docker push $(docker_repo)/kopano_$(component):$$version ; \
+	done
 	docker push $(docker_repo)/kopano_$(component):latest
 ifdef DOCKERREADME
 	.travis/docker-hub-helper.sh $(component)