diff --git a/Makefile b/Makefile
index d02e966..192fe1c 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ export
 # convert lowercase componentname to uppercase
 COMPONENT = $(shell echo $(component) | tr a-z A-Z)
 
-build-all: build-ssl build-base build-core build-utils build-webapp build-zpush build-kweb build-konnect build-playground build-ldap-demo
+build-all: build-ssl build-base build-core build-utils build-webapp build-zpush build-web build-konnect build-playground build-ldap-demo
 
 .PHONY: build
 build: component ?= base
@@ -65,8 +65,8 @@ build-zpush:
 build-ssl:
 	docker build -t $(docker_repo)/kopano_ssl ssl/
 
-build-kweb:
-	docker build -t $(docker_repo)/kopano_web kweb/
+build-web:
+	docker build -t $(docker_repo)/kopano_web web/
 
 build-konnect:
 	docker build -t $(docker_repo)/kopano_konnect konnect/
@@ -111,11 +111,22 @@ tag-zpush:
 	$(shell docker run --rm $(docker_repo)/kopano_zpush cat /kopano/buildversion | tail -n 1 | grep -o -P '(?<=-).*(?=\+)'))
 	component=zpush make tag-container
 
+tag-web:
+	$(eval web_version := \
+	$(shell docker run --rm $(docker_repo)/kopano_web env | grep CODE_VERSION | cut -d'=' -f2))
+	component=web make tag-container
+
+tag-konnect:
+	$(eval konnect_version := \
+	$(shell docker run --rm $(docker_repo)/kopano_konnect env | grep CODE_VERSION | cut -d'=' -f2))
+	component=konnect make tag-container
+
+
 # Docker publish
 repo-login:
 	@docker login -u $(docker_login) -p $(docker_pwd)
 
-publish: repo-login publish-ssl publish-base publish-core publish-utils publish-webapp publish-zpush publish-ssl publish-kweb publish-playground
+publish: repo-login publish-ssl publish-base publish-core publish-utils publish-webapp publish-zpush publish-ssl publish-web publish-playground
 
 publish-container: component ?= base
 publish-container:
@@ -141,10 +152,10 @@ publish-zpush: build-zpush tag-zpush
 publish-ssl: build-ssl
 	docker push $(docker_repo)/kopano_ssl:latest
 
-publish-kweb: build-kweb
+publish-web: build-web tag-web
 	docker push $(docker_repo)/kopano_web:latest
 
-publish-konnect: build-konnect
+publish-konnect: build-konnect tag-konnect
 	docker push $(docker_repo)/kopano_konnect:latest
 
 publish-playground: build-playground
diff --git a/docker-compose.yml-example b/docker-compose.yml-example
index ff13929..4f39b70 100644
--- a/docker-compose.yml-example
+++ b/docker-compose.yml-example
@@ -377,6 +377,16 @@ services:
      - kopano-net
      - web-net
 
+  kopano_kwmserver:
+    image: kopano/kwmserverd:0.13.1
+    container_name: kopano_kwmserver
+    environment:
+     - KWMSERVERD_ADMIN_TOKENS_KEY_FILE=/kopano/ssl/kwm-admin-tokens.key
+    volumes:
+     - kopanossl/:/kopano/ssl
+    networks:
+      - web-net
+
 volumes:
   web:
   ldap:
diff --git a/konnect/Dockerfile b/konnect/Dockerfile
index 6cf251c..4f4572b 100644
--- a/konnect/Dockerfile
+++ b/konnect/Dockerfile
@@ -1,4 +1,7 @@
-FROM kopano/konnectd:0.16.1
+ARG CODE_VERSION=0.16.1
+FROM kopano/konnectd:${CODE_VERSION}
+ARG CODE_VERSION
+ENV CODE_VERSION="${CODE_VERSION}"
 
 RUN apk add --update \
 	openssl \
diff --git a/kweb/Dockerfile b/kweb/Dockerfile
deleted file mode 100644
index 1e918a0..0000000
--- a/kweb/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM kopano/kwebd:0.4.2
-COPY wrapper.sh /usr/local/bin
-COPY kweb.cfg /etc/kweb.cfg
-
diff --git a/web/Dockerfile b/web/Dockerfile
new file mode 100644
index 0000000..e05ca59
--- /dev/null
+++ b/web/Dockerfile
@@ -0,0 +1,8 @@
+ARG CODE_VERSION=0.4.2
+FROM kopano/kwebd:${CODE_VERSION}
+ARG CODE_VERSION
+ENV CODE_VERSION="${CODE_VERSION}"
+
+COPY wrapper.sh /usr/local/bin
+COPY kweb.cfg /etc/kweb.cfg
+
diff --git a/kweb/kweb.cfg b/web/kweb.cfg
similarity index 100%
rename from kweb/kweb.cfg
rename to web/kweb.cfg
diff --git a/kweb/wrapper.sh b/web/wrapper.sh
similarity index 100%
rename from kweb/wrapper.sh
rename to web/wrapper.sh