diff --git a/Makefile b/Makefile
index d18b6c2..3bf0665 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,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-webapp build-zpush
+build-all: build-ssl build-base build-core build-webapp build-zpush build-kweb build-ldap-demo
 
 build: component ?= base
 build:
@@ -116,4 +116,4 @@ test:
 	docker-compose down -v || true
 	make build-all
 	docker-compose build
-	docker-compose up
+	docker-compose up -d
diff --git a/ldap-demo/bootstrap/ldif/optimize-index.ldif b/ldap-demo/bootstrap/ldif/optimize-index.ldif
new file mode 100644
index 0000000..135dc1b
--- /dev/null
+++ b/ldap-demo/bootstrap/ldif/optimize-index.ldif
@@ -0,0 +1,12 @@
+dn: olcDatabase={1}mdb,cn=config
+changetype: modify
+add: olcDbIndex
+olcDbIndex: cn eq
+olcDbIndex: gidNumber eq
+olcDbIndex: memberUid eq
+olcDbIndex: ou eq
+olcDbIndex: uidNumber eq
+olcDbIndex: uniqueMember eq
+olcDbIndex: kopanoAccount eq
+olcDbIndex: kopanoAliases eq
+olcDbIndex: kopanoViewPrivilege eq