diff --git a/web/Dockerfile b/web/Dockerfile
index c3c4e2e..c485700 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -4,23 +4,26 @@ FROM kopano/kwebd:${CODE_VERSION}
 ARG VCS_REF
 ARG CODE_VERSION
 
-ENV CODE_VERSION="${CODE_VERSION}"
-ENV DEFAULTREDIRECT="/webapp"
-# Workaround to not break backwards compatibility,
+ENV \
+    CODE_VERSION="${CODE_VERSION}" \
+    DEFAULTREDIRECT="/webapp" \
+    KONNECTPATH=kopanoid
+# FIXME Workaround to not break backwards compatibility,
 # since an underscore is not a valid char in a hostname.
 # This causes issues when using kweb in kubernetes.
 # Related issue https://github.com/docker/compose/issues/229
-ENV KWEBD_DNS_KONNECT="kopano_konnect"
-ENV KWEBD_DNS_MEET="kopano_meet"
-ENV KWEBD_DNS_KAPI="kopano_kapi"
-ENV KWEBD_DNS_PLAYGROUND="kopano_playground"
-ENV KWEBD_DNS_KWMSERVER="kopano_kwmserver"
-ENV KWEBD_DNS_WEBAPP="kopano_webapp"
-ENV KWEBD_DNS_ZPUSH="kopano_zpush"
-ENV KWEBD_DNS_ICAL="kopano_ical"
-ENV KWEBD_DNS_KDAV="kopano_kdav"
-ENV KWEBD_DNS_GRAPI="kopano_grapi"
-ENV KWEBD_DNS_ICAL="kopano_ical"
+ENV \
+    KWEBD_DNS_KONNECT="kopano_konnect" \
+    KWEBD_DNS_MEET="kopano_meet" \
+    KWEBD_DNS_KAPI="kopano_kapi" \
+    KWEBD_DNS_PLAYGROUND="kopano_playground" \
+    KWEBD_DNS_KWMSERVER="kopano_kwmserver" \
+    KWEBD_DNS_WEBAPP="kopano_webapp" \
+    KWEBD_DNS_ZPUSH="kopano_zpush" \
+    KWEBD_DNS_ICAL="kopano_ical" \
+    KWEBD_DNS_KDAV="kopano_kdav" \
+    KWEBD_DNS_GRAPI="kopano_grapi" \
+    KWEBD_DNS_ICAL="kopano_ical"
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
diff --git a/web/kweb.cfg b/web/kweb.cfg
index b74fafb..728bba7 100644
--- a/web/kweb.cfg
+++ b/web/kweb.cfg
@@ -64,11 +64,11 @@
 	}
 	redir /signin /signin/v1/identifier
 
-	# Konnect in subpath - this config supports /kopanoid as a subpath
-	rewrite /kopanoid/konnect/v1/ {
+	# Konnect in subpath - by default this config supports /kopanoid as a subpath
+	rewrite /{%KONNECTPATH%}/konnect/v1/ {
 		to /upstreams/konnect/{path}
 	}
-	rewrite /kopanoid/signin/v1/ {
+	rewrite /{%KONNECTPATH%}/signin/v1/ {
 		to /upstreams/konnect/{path}
 	}