diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0979ce6..821673b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # 1.2.2
 
-- [kopano](src/kopano) adding support for ical configuration via envvars in, 50-kopano-apply-envvars.
+- [kopano](src/kopano) adding support for gateway / imap ical search configuration via envvars in, 50-kopano-apply-envvars.
 
 # 1.2.1
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 809c054..d899dd7 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,5 +1,13 @@
 # Road map
 
+## Common configurations
+
+The following directives exist:
+
+```sh
+!include common.cfg
+```
+
 ## Revisit Persistent Data
 
 Consider consolidating directories which are candidates for persistence under `/srv`.
diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index 6aed495..452b789 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -6,7 +6,9 @@ services:
     networks:
       - backend
     ports:
-      - "127.0.0.1:8008:80"    # HTTP alternative
+      - "127.0.0.1:8008:80"    # WebApp & EAS (alt. HTTP)
+      - "127.0.0.1:110:110"    # POP3
+      - "127.0.0.1:143:143"    # IMAP
       - "127.0.0.1:8080:8080"  # ICAL
     depends_on:
       - auth
diff --git a/src/kopano/entry.d/50-kopano-apply-envvars b/src/kopano/entry.d/50-kopano-apply-envvars
index 36e0aa2..e36c700 100755
--- a/src/kopano/entry.d/50-kopano-apply-envvars
+++ b/src/kopano/entry.d/50-kopano-apply-envvars
@@ -13,29 +13,33 @@
 DOCKER_CONF_DIR1=${DOCKER_CONF_DIR1-/etc/kopano}
 DOCKER_CONF_DIR2=${DOCKER_CONF_DIR2-/usr/share/z-push}
 
-server_cfg_file=$DOCKER_CONF_DIR1/server.cfg
-ldap_cfg_file=$DOCKER_CONF_DIR1/ldap.cfg
-spooler_cfg_file=$DOCKER_CONF_DIR1/spooler.cfg
 dagent_cfg_file=$DOCKER_CONF_DIR1/dagent.cfg
-spamd_cfg_file=$DOCKER_CONF_DIR1/spamd.cfg
+gateway_cfg_file=$DOCKER_CONF_DIR1/gateway.cfg
 ical_cfg_file=$DOCKER_CONF_DIR1/ical.cfg
+ldap_cfg_file=$DOCKER_CONF_DIR1/ldap.cfg
+search_cfg_file=$DOCKER_CONF_DIR1/search.cfg
+server_cfg_file=$DOCKER_CONF_DIR1/server.cfg
+spamd_cfg_file=$DOCKER_CONF_DIR1/spamd.cfg
+spooler_cfg_file=$DOCKER_CONF_DIR1/spooler.cfg
 
-zpush_cfg_file=$DOCKER_CONF_DIR2/config.php
 sqlstate_cfg_file=$DOCKER_CONF_DIR2/backend/sqlstatemachine/config.php
+zpush_cfg_file=$DOCKER_CONF_DIR2/config.php
 
 #
 # define environment variables
 #
 
-server_env_vars="MYSQL_HOST MYSQL_PORT MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD DISABLED_FEATURES USER_PLUGIN LOG_LEVEL"
-ldap_env_vars="LDAP_URI LDAP_HOST LDAP_PORT LDAP_PROTOCOL LDAP_SEARCH_BASE LDAP_USER_TYPE_ATTRIBUTE_VALUE LDAP_GROUP_TYPE_ATTRIBUTE_VALUE LDAP_USER_SEARCH_FILTER"
-spooler_env_vars="SMTP_SERVER SMTP_PORT LOG_LEVEL"
-dagent_env_vars="LMTP_LISTEN LOG_LEVEL"
-spamd_env_vars="LOG_METHOD SPAM_DIR SPAM_DB HEADER_TAG LEARN_HAM HAM_DIR SA_GROUP"
+dagent_env_vars="LMTP_LISTEN LOG_LEVEL SPAM_HEADER_NAME SPAM_HEADER_VALUE"
+gateway_env_vars="DISABLE_PLAINTEXT_AUTH HTML_SAFETY_FILTER IMAP_CAPABILITY_IDLE IMAP_EXPUNGE_ON_DELETE IMAP_IGNORE_COMMAND_IDLE IMAP_LISTEN IMAP_MAX_FAIL_COMMANDS IMAP_MAX_MESSAGESIZE IMAP_ONLY_MAILFOLDERS IMAP_PUBLIC_FOLDERS IMAPS_LISTEN POP3_LISTEN POP3S_LISTEN"
 ical_env_vars="ICAL_LISTEN ICALS_LISTEN ENABLE_ICAL_GET"
+ldap_env_vars="LDAP_URI LDAP_HOST LDAP_PORT LDAP_PROTOCOL LDAP_SEARCH_BASE LDAP_USER_TYPE_ATTRIBUTE_VALUE LDAP_GROUP_TYPE_ATTRIBUTE_VALUE LDAP_USER_SEARCH_FILTER"
+search_env_vars="INDEX_PROCESSES INDEX_DRAFTS INDEX_JUNK SUGGESTIONS INDEX_ATTACHMENTS INDEX_ATTACHMENT_MAX_SIZE"
+server_env_vars="MYSQL_HOST MYSQL_PORT MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD DISABLED_FEATURES USER_PLUGIN LOG_LEVEL SEARCH_TIMEOUT"
+spamd_env_vars="LOG_METHOD SPAM_DIR SPAM_DB HEADER_TAG LEARN_HAM HAM_DIR SA_GROUP"
+spooler_env_vars="SMTP_SERVER SMTP_PORT LOG_LEVEL"
 
-zpush_env_vars="TIMEZONE USE_CUSTOM_REMOTE_IP_HEADER USE_FULLEMAIL_FOR_LOGIN STATE_MACHINE STATE_DIR LOGBACKEND LOGLEVEL LOGAUTHFAIL LOG_SYSLOG_PROGRAM LOG_SYSLOG_FACILITY SYNC_CONFLICT_DEFAULT PING_INTERVAL FILEAS_ORDER SYNC_MAX_ITEMS UNSET_UNDEFINED_PROPERTIES ALLOW_WEBSERVICE_USERS_ACCESS USE_PARTIAL_FOLDERSYNC"
 sqlstate_env_vars="STATE_SQL_ENGINE STATE_SQL_SERVER STATE_SQL_PORT STATE_SQL_DATABASE STATE_SQL_USER STATE_SQL_PASSWORD STATE_SQL_OPTIONS"
+zpush_env_vars="TIMEZONE USE_CUSTOM_REMOTE_IP_HEADER USE_FULLEMAIL_FOR_LOGIN STATE_MACHINE STATE_DIR LOGBACKEND LOGLEVEL LOGAUTHFAIL LOG_SYSLOG_PROGRAM LOG_SYSLOG_FACILITY SYNC_CONFLICT_DEFAULT PING_INTERVAL FILEAS_ORDER SYNC_MAX_ITEMS UNSET_UNDEFINED_PROPERTIES ALLOW_WEBSERVICE_USERS_ACCESS USE_PARTIAL_FOLDERSYNC"
 
 #
 # Define helpers
@@ -71,17 +75,19 @@ _kopano_apply_phpenvvars_gen() {
 }
 
 kopano_apply_envvars() {
-	_kopano_apply_envvars_gen $server_cfg_file   $server_env_vars
-	_kopano_apply_envvars_gen $ldap_cfg_file     $ldap_env_vars
-	_kopano_apply_envvars_gen $spooler_cfg_file  $spooler_env_vars
 	_kopano_apply_envvars_gen $dagent_cfg_file   $dagent_env_vars
-	_kopano_apply_envvars_gen $spamd_cfg_file    $spamd_env_vars
+	_kopano_apply_envvars_gen $gateway_cfg_file  $gateway_env_vars
 	_kopano_apply_envvars_gen $ical_cfg_file     $ical_env_vars
+	_kopano_apply_envvars_gen $ldap_cfg_file     $ldap_env_vars
+	_kopano_apply_envvars_gen $search_cfg_file   $search_env_vars
+	_kopano_apply_envvars_gen $server_cfg_file   $server_env_vars
+	_kopano_apply_envvars_gen $spamd_cfg_file    $spamd_env_vars
+	_kopano_apply_envvars_gen $spooler_cfg_file  $spooler_env_vars
 }
 
 kopano_apply_phpenvvars() {
-	_kopano_apply_phpenvvars_gen $zpush_cfg_file    $zpush_env_vars
 	_kopano_apply_phpenvvars_gen $sqlstate_cfg_file $sqlstate_env_vars
+	_kopano_apply_phpenvvars_gen $zpush_cfg_file    $zpush_env_vars
 }
 
 #