diff --git a/core/start-service.sh b/core/start-service.sh
index 9f818e8..75b9911 100755
--- a/core/start-service.sh
+++ b/core/start-service.sh
@@ -75,7 +75,7 @@ ical)
 grapi)
 	LC_CTYPE=en_US.UTF-8
 	export socket_path=/var/run/kopano/grapi
-	mkdir $socket_path
+	mkdir -p $socket_path
 	chown -R kapi:kopano $socket_path
 	# cleaning up env variables
 	unset "${!KCCONF_@}"
diff --git a/docker-compose.yml-example b/docker-compose.yml-example
index 4f39b70..d20ad4e 100644
--- a/docker-compose.yml-example
+++ b/docker-compose.yml-example
@@ -22,7 +22,7 @@ services:
     image: ${docker_repo:?err}/kopano_ldap_demo
     container_name: ldap
     ports:
-      - 389:389
+      - ${LDAPPORT:-389}:389
     environment:
       - LDAP_ORGANISATION=${LDAP_ORGANISATION}
       - LDAP_DOMAIN=${LDAP_DOMAIN}
diff --git a/setup.sh b/setup.sh
index 6290043..25778b6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -297,6 +297,7 @@ FQDN=$FQDN
 EMAIL=$EMAIL
 HTTP=80
 HTTPS=443
+LDAPPORT=389
 
 # Settings for test environments
 EXTRAHOSTS=$FQDN:$(ip route get 1 | sed -n 's/^.*src \([0-9.]*\) .*$/\1/p')