diff --git a/.env b/.env
index ccfa517afb..982648ee33 100644
--- a/.env
+++ b/.env
@@ -69,7 +69,7 @@ MF_COAP_ADAPTER_PORT=5683
 ## Addons Services
 ### Bootstrap
 MF_BOOTSTRAP_LOG_LEVEL=debug
-MF_BOOTSTRAP_PORT=8200
+MF_BOOTSTRAP_PORT=8202
 MF_BOOTSTRAP_DB_PORT=5432
 MF_BOOTSTRAP_DB_USER=mainflux
 MF_BOOTSTRAP_DB_PASS=mainflux
diff --git a/docs/storage.md b/docs/storage.md
index 2255d52337..f414be5a40 100644
--- a/docs/storage.md
+++ b/docs/storage.md
@@ -13,6 +13,16 @@ In order to run these services, core services, as well as the network from the c
 
 Writers provide an implementation of various `message writers`. Message writers are services that consume normalized (in `SenML` format) Mainflux messages and store them in specific data store.
 
+Every writer can filter messages based on channel list that is set in
+`channels.toml` configuration file. If you want to listen on all channels, 
+just pass one element ["*"], otherwise pass the list of channels. Here is
+an example:
+
+```toml
+[channels]
+filter = ["*"]
+```
+
 ### InfluxDB, InfluxDB-writer and Grafana
 
 From the project root execute the following command:
diff --git a/writers/README.md b/writers/README.md
index 34f5de1717..cc83d40db9 100644
--- a/writers/README.md
+++ b/writers/README.md
@@ -4,7 +4,7 @@ Writers provide an implementation of various `message writers`.
 Message writers are services that consume normalized (in `SenML` format)
 Mainflux messages and store them in specific data store.
 
-Writers are optional services and are treated as a plugins. In order to
+Writers are optional services and are treated as plugins. In order to
 run writer services, core services must be up and running. For more info
 on the platform core services with its dependencies, please check out
 the [Docker Compose][compose] file.
diff --git a/writers/cassandra/README.md b/writers/cassandra/README.md
index 4eabda9ec1..6db3fde668 100644
--- a/writers/cassandra/README.md
+++ b/writers/cassandra/README.md
@@ -18,7 +18,7 @@ default values.
 | MF_CASSANDRA_WRITER_DB_USERNAME     | Cassandra DB username                                      |                       |
 | MF_CASSANDRA_WRITER_DB_PASSWORD     | Cassandra DB password                                      |                       |
 | MF_CASSANDRA_WRITER_DB_PORT         | Cassandra DB port                                          | 9042                  |
-| MF_CASSANDRA_WRITER_CHANNELS_CONFIG | Configuration file path with channels list                 | /config/channels.yaml |
+| MF_CASSANDRA_WRITER_CHANNELS_CONFIG | Configuration file path with channels list                 | /config/channels.toml |
 ## Deployment
 
 ```yaml
diff --git a/writers/influxdb/README.md b/writers/influxdb/README.md
index ca97e64ca9..c4eaf93a1b 100644
--- a/writers/influxdb/README.md
+++ b/writers/influxdb/README.md
@@ -20,7 +20,7 @@ default values.
 | MF_INFLUX_WRITER_DB_PORT         | Default port of InfluxDB database                         | 8086                  |
 | MF_INFLUX_WRITER_DB_USER         | Default user of InfluxDB database                         | mainflux              |
 | MF_INFLUX_WRITER_DB_PASS         | Default password of InfluxDB user                         | mainflux              |
-| MF_INFLUX_WRITER_CHANNELS_CONFIG | Configuration file path with channels list                | /config/channels.yaml |
+| MF_INFLUX_WRITER_CHANNELS_CONFIG | Configuration file path with channels list                | /config/channels.toml |
 
 ## Deployment
 
diff --git a/writers/mongodb/README.md b/writers/mongodb/README.md
index 8bb6953729..43f5a5029f 100644
--- a/writers/mongodb/README.md
+++ b/writers/mongodb/README.md
@@ -16,7 +16,7 @@ default values.
 | MF_MONGO_WRITER_DB_NAME         | Default MongoDB database name              | mainflux              |
 | MF_MONGO_WRITER_DB_HOST         | Default MongoDB database host              | localhost             |
 | MF_MONGO_WRITER_DB_PORT         | Default MongoDB database port              | 27017                 |
-| MF_MONGO_WRITER_CHANNELS_CONFIG | Configuration file path with channels list | /config/channels.yaml |
+| MF_MONGO_WRITER_CHANNELS_CONFIG | Configuration file path with channels list | /config/channels.toml |
 
 ## Deployment
 
diff --git a/writers/postgres/README.md b/writers/postgres/README.md
index fb70963e7b..5d83d0d8e4 100644
--- a/writers/postgres/README.md
+++ b/writers/postgres/README.md
@@ -22,7 +22,7 @@ default values.
 | MF_POSTGRES_WRITER_DB_SSL_CERT      | Postgres SSL certificate path              | ""                    |
 | MF_POSTGRES_WRITER_DB_SSL_KEY       | Postgres SSL key                           | ""                    |
 | MF_POSTGRES_WRITER_DB_SSL_ROOT_CERT | Postgres SSL root certificate path         | ""                    |
-| MF_POSTGRES_WRITER_CHANNELS_CONFIG  | Configuration file path with channels list | /config/channels.yaml |
+| MF_POSTGRES_WRITER_CHANNELS_CONFIG  | Configuration file path with channels list | /config/channels.toml |
 
 ## Deployment