diff --git a/docker-compose.yml-example b/docker-compose.yml-example
index b426dc1..250a872 100644
--- a/docker-compose.yml-example
+++ b/docker-compose.yml-example
@@ -191,7 +191,7 @@ services:
       - kopanonet
 
   kopano_zpush:
-    image: ${docker_repo:?err}/kopano_zpush:${WEBAPP_VERSION}
+    image: ${docker_repo:?err}/kopano_zpush:${ZPUSH_VERSION}
     hostname: kopano_zpush
     container_name: kopano_zpush
     links:
diff --git a/setup.sh b/setup.sh
index f87a8c1..3cf87c7 100755
--- a/setup.sh
+++ b/setup.sh
@@ -27,6 +27,10 @@ if [ ! -e ./.env ]; then
 	read -p "Which tag do you want to use for Kopano WebApp? [$value_default]: " new_value
 	WEBAPP_VERSION=${new_value:-$value_default}
 
+	value_default=latest
+	read -p "Which tag do you want to use for Z-Push? [$value_default]: " new_value
+	ZPUSH_VERSION=${new_value:-$value_default}
+
 	value_default="Kopano Demo"
 	read -p "Name of the Organisation for LDAP [$value_default]: " new_value
 	LDAP_ORGANISATION=${new_value:-$value_default}
@@ -124,6 +128,7 @@ if [ ! -e ./.env ]; then
 # for possible configuration values and their impact
 CORE_VERSION=$CORE_VERSION
 WEBAPP_VERSION=$WEBAPP_VERSION
+ZPUSH_VERSION=$ZPUSH_VERSION
 
 LDAP_ORGANISATION="$LDAP_ORGANISATION"
 LDAP_DOMAIN=$FQDN
diff --git a/web/Caddyfile b/web/Caddyfile
deleted file mode 100644
index 6e6e442..0000000
--- a/web/Caddyfile
+++ /dev/null
@@ -1,11 +0,0 @@
-webapp.kopano.demo {
-
-	tls self_signed
-
-	redir / /webapp
-
-	proxy /webapp kwebapp:80 {
-		transparent
-		websocket
-	}
-}