diff --git a/Caddyfile b/Caddyfile
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/Makefile
index 66a4f51..9f21417 100644
--- a/Makefile
+++ b/Makefile
@@ -49,17 +49,17 @@ publish: git-commit repo-login publish-base publish-core publish-webapp
 	git push
 	git push origin --tags
 
+publish-container: component ?= base
+publish-container:
+	@echo 'publish latest to $(docker_repo)/kopano_$(component)'
+	docker push $(docker_repo)/kopano_$(component):${$(component)_version}
+	docker push $(docker_repo)/kopano_$(component):latest
+
 publish-base: build-base tag-base
-	@echo 'publish latest to $(docker_repo)/kopano_base'
-	docker push $(docker_repo)/kopano_base:${base_version}
-	docker push $(docker_repo)/kopano_base:latest
+	component=base make publish-container
 
 publish-core: build-core tag-core
-	@echo 'publish latest to $(docker_repo)/kopano_core'
-	docker push $(docker_repo)/kopano_core:${core_version}
-	docker push $(docker_repo)/kopano_core:latest
+	component=core make publish-container
 
 publish-webapp: build-webapp tag-webapp
-	@echo 'publish latest to $(docker_repo)/kopano_webapp'
-	docker push $(docker_repo)/kopano_webapp:${webapp_version}
-	docker push $(docker_repo)/kopano_webapp:latest
+	component=webapp make publish-container
diff --git a/base/Dockerfile b/base/Dockerfile
index e33e6cd..3737836 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -10,7 +10,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # install basics
 # TODO require python3 or python3-minimal?
-# TODO is dumb-init actually used?
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install --no-install-recommends -y \
diff --git a/core/Dockerfile b/core/Dockerfile
index 0326db6..6fdd16d 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -10,7 +10,6 @@ ARG RELEASE_KEY_DOWNLOAD=0
 # install Kopano WebApp and refresh ca-certificates
 RUN \
     # community download and package as apt source repository
-    # TODO: source or execute repo script?
     . /kopano/helper/create-kopano-repo.sh && \
     if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
         dl_and_package_community "core"; \
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index d859145..c327340 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -11,7 +11,6 @@ ARG RELEASE_KEY_DOWNLOAD=0
 # install Kopano WebApp and refresh ca-certificates
 RUN \
     # community download and package as apt source repository
-    # TODO: source or execute repo script?
     . /kopano/helper/create-kopano-repo.sh && \
     if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
         dl_and_package_community "core"; \