diff --git a/README.md b/README.md
index 29d7960..339e23f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # KopanoDocker
-Inofficial kopano docker images for all kopano services.
+Unofficial kopano docker images for all kopano services.
+Use kopano_core image for server/spooler/dagent/search/monitor/ical/gateway services.
+Use kopano_webapp for web service.
 
 Example
 =======
@@ -11,7 +13,7 @@ version: '3'
 services:
 
   kserver:
-    image: zokradonh/kopano_server:${CORE_VERSION}
+    image: zokradonh/kopano_core:${CORE_VERSION}
     hostname: kserver
     container_name: kopano_server
     links:
@@ -38,6 +40,8 @@ services:
       - KCCONF_LDAP_LDAP_BIND_USER=cn=SOME_STANDARD_USER,OU=MyUsers,DC=domain,DC=tld #change here
       - KCCONF_LDAP_LDAP_BIND_PASSWD=PASSWORD_OF_STANDARD_USER  #change here
       - KCCONF_LDAP_LDAP_SEARCH_BASE=OU=MyUsers,dc=domain,dc=tld  #change here
+      - KCCOMMENT_LDAP_1=!include /usr/share/kopano/ldap.openldap.cfg #delete if you want openldap
+      - KCUNCOMMENT_LDAP_1=!include /usr/share/kopano/ldap.active-directory.cfg #delete if you want openldap
     networks:
       - kopanonet
     volumes:
@@ -45,7 +49,7 @@ services:
       - sslcerts:/kopano/ssl
 
   kdagent:
-    image: zokradonh/kopano_dagent:${CORE_VERSION}
+    image: zokradonh/kopano_core:${CORE_VERSION}
     container_name: kopano_dagent
     links:
       - kserver
@@ -60,7 +64,7 @@ services:
       - kopanonet
 
   kgateway:
-    image: zokradonh/kopano_gateway:${CORE_VERSION}
+    image: zokradonh/kopano_core:${CORE_VERSION}
     container_name: kopano_gateway
     links:
       - kserver
@@ -75,7 +79,7 @@ services:
       - kopanonet
 
   kical:
-    image: zokradonh/kopano_ical:${CORE_VERSION}
+    image: zokradonh/kopano_core:${CORE_VERSION}
     container_name: kopano_ical
     links:
       - kserver
@@ -86,7 +90,7 @@ services:
       - kopanonet
 
   kmonitor:
-    image: zokradonh/kopano_monitor:${CORE_VERSION}
+    image: zokradonh/kopano_core:${CORE_VERSION}
     container_name: kopano_monitor
     links:
       - kserver
@@ -100,7 +104,7 @@ services:
       - kopanonet
 
   ksearch:
-    image: zokradonh/kopano_search:${CORE_VERSION}
+    image: zokradonh/kopano_core:${CORE_VERSION}
     container_name: kopano_search
     links:
       - kserver
@@ -115,7 +119,7 @@ services:
       - kopanonet
 
   kspooler:
-    image: zokradonh/kopano_spooler:${CORE_VERSION}
+    image: zokradonh/kopano_core:${CORE_VERSION}
     container_name: kopano_spooler
     links:
       - kserver
@@ -244,14 +248,12 @@ networks:
 Requires haproxy network for http reverse proxy.
 Change all lines which are commented especially those with #change here
 
-Requires Active Directory as user backend.
-
 This is just a quick example docker-compose.yml made in some minutes to provide a better start.
 
 Requires `.env` file next to docker-compose.yml with content like this
 ```
-CORE_VERSION=core-8.6.80.45
-WEBAPP_VERSION=webapp-3.4.8.1296
+CORE_VERSION=8.6.80.1055-0plus156.1
+WEBAPP_VERSION=3.4.17.1565plus895.1
 ```
 
 Requires `ldap-groups.cf` in ./mtaconfig directory next to docker-compose.yml
diff --git a/build.sh b/build.sh
index 32a811c..10941c9 100644
--- a/build.sh
+++ b/build.sh
@@ -43,7 +43,7 @@ if [ $isproxyup -eq 0 ]
 then
     echo "Build proxy container not runnning - now building..."
     docker build -t kopano_buildproxy ${buildcontext_base}repoproxy
-    echo "Start building proxy..."
+    echo "Start buildproxy helper..."
     docker run --rm -ti -d -e KOPANO_SERIAL=$serial --network buildkopano_bnet --network-alias buildproxy kopano_buildproxy
 fi
 
diff --git a/core/README.md b/core/README.md
index 0e6546b..52a90ee 100644
--- a/core/README.md
+++ b/core/README.md
@@ -2,13 +2,12 @@ E-Mail attachment directory is by default in `/kopano/data/attachments/` so bind
 
 You can reconfigure by setting environment variable `KCCONF_SERVER_ATTACHMENT_PATH`.
 
-You can change all server.cfg settings you like prefixed with "`KCCONF_SERVER_`"
-So specify "`KCCONF_SERVER_MYSQL_HOST`" for "mysql\_host" setting in "server.cfg".
-Or specify "`KCCONF_LDAP_LDAP_SEARCH_BASE`" to set "ldap\_search_base" in "ldap.cfg".
+You can change all server.cfg settings you like prefixed with `KCCONF_SERVER_`
+So specify `KCCONF_SERVER_MYSQL_HOST` for `mysql_host` setting in `server.cfg`.
+Or specify `KCCONF_LDAP_LDAP_SEARCH_BASE` to set `ldap_search_base` in `ldap.cfg`.
 
-This image activates ActiveDirectory mode (Not OpenLDAP).
-So you need an ActiveDirectory already running to use this.
-You may try to override default settings with "`KCCONF_*`" options but using OpenLDAP instead of ActiveDirectory will fail due to !include command in ldap.cfg. This docker image does not support any method to edit this file. Create your own Dockerfile to enable OpenLDAP.
+You may override default settings with `KCCONF_*` options or comment specific options in/out with `KCCOMMENT_filenameWithoutExtension_anystring=searchline`  
+e.g. `KCCOMMENT_LDAP_1=!include /usr/share/kopano/ldap.openldap.cfg`
 
 For coredumps on crashes kopano-server requires the fs.suid_dumpable sysctl to contain the value 2, not 0.