diff --git a/docker-compose.yml b/docker-compose.yml
index 49d761a..0eb063a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -220,7 +220,7 @@ services:
       - /tmp
 
   kopano_kapps:
-    image: ${docker_repo:-zokradonh}/kopano_kapps:${CORE_VERSION:-latest}
+    image: ${docker_repo:-zokradonh}/kopano_kapps:${KAPPS_VERSION:-latest}
     read_only: true
     restart: unless-stopped
     environment:
diff --git a/setup.sh b/setup.sh
index 05ce146..6b50ce8 100755
--- a/setup.sh
+++ b/setup.sh
@@ -84,6 +84,10 @@ if [ ! -e ./.env ]; then
 	read -r -p "Which tag do you want to use for Kopano Konnect? [$value_default]: " new_value
 	KONNECT_VERSION=${new_value:-$value_default}
 
+	value_default=latest
+	read -r -p "Which tag do you want to use for Kopano Kapps? [$value_default]: " new_value
+	KAPPS_VERSION=${new_value:-$value_default}
+
 	value_default=latest
 	read -r -p "Which tag do you want to use for Kopano Kwmserver? [$value_default]: " new_value
 	KWM_VERSION=${new_value:-$value_default}
@@ -268,6 +272,7 @@ KONNECT_VERSION=$KONNECT_VERSION
 KWM_VERSION=$KWM_VERSION
 MEET_VERSION=$MEET_VERSION
 KDAV_VERSION=$KDAV_VERSION
+KAPPS_VERSION=$KAPPS_VERSION
 
 LDAP_CONTAINER=$LDAP_CONTAINER
 LDAP_ORGANISATION="$LDAP_ORGANISATION"