diff --git a/docker/addons/timescaledb-writer/001_create_messages.sql b/docker/addons/timescaledb-writer/001_create_messages.sql
new file mode 100644
index 0000000000..ede2f38c85
--- /dev/null
+++ b/docker/addons/timescaledb-writer/001_create_messages.sql
@@ -0,0 +1,24 @@
+-- Write your migrate up statements here
+
+CREATE TABLE IF NOT EXISTS messages (
+                        channel       UUID,
+                        subtopic      VARCHAR(254),
+                        publisher     UUID,
+                        protocol      TEXT,
+                        name          TEXT,
+                        unit          TEXT,
+                        value         FLOAT,
+                        string_value  TEXT,
+                        bool_value    BOOL,
+                        data_value    BYTEA,
+                        sum           FLOAT,
+                        time          TIMESTAMPTZ NOT NULL,
+                        update_time   FLOAT
+                    );
+SELECT create_hypertable('messages', 'time');
+---- create above / drop below ----
+
+DROP TABLE messages
+
+-- Write your migrate down statements here. If this migration is irreversible
+-- Then delete the separator line above.
diff --git a/docker/addons/timescaledb-writer/config.toml b/docker/addons/timescaledb-writer/config.toml
new file mode 100644
index 0000000000..fa1b356920
--- /dev/null
+++ b/docker/addons/timescaledb-writer/config.toml
@@ -0,0 +1,5 @@
+# To listen all messsage broker subjects use default value "channels.>".
+# To subscribe to specific subjects use values starting by "channels." and
+# followed by a subtopic (e.g ["channels.<channel_id>.sub.topic.x", ...]).
+[subjects]
+filter = ["channels.>"]
diff --git a/docker/addons/timescaledb-writer/docker-compose.yml b/docker/addons/timescaledb-writer/docker-compose.yml
new file mode 100644
index 0000000000..a1ef14b47d
--- /dev/null
+++ b/docker/addons/timescaledb-writer/docker-compose.yml
@@ -0,0 +1,61 @@
+# Copyright (c) Mainflux
+# SPDX-License-Identifier: Apache-2.0
+
+# This docker-compose file contains optional Postgres and Postgres-writer services
+# for Mainflux platform. Since these are optional, this file is dependent of docker-compose file
+# from <project_root>/docker. In order to run these services, execute command:
+# docker-compose -f docker/docker-compose.yml -f docker/addons/timescaledb-writer/docker-compose.yml up
+# from project root. PostgreSQL default port (5432) is exposed, so you can use various tools for database
+# inspection and data visualization.
+
+version: "3.7"
+
+networks:
+    docker_mainflux-base-net:
+        external: true
+
+volumes:
+    mainflux-timescaledb-writer-volume:
+
+services:
+    timescaledb:
+        image: timescale/timescaledb:2.1.1-pg13
+        container_name: mainflux-timescaledb
+        restart: on-failure
+        environment:
+            POSTGRES_USER: ${MF_POSTGRES_WRITER_DB_USER}
+            POSTGRES_PASSWORD: ${MF_POSTGRES_WRITER_DB_PASS}
+            POSTGRES_DB: ${MF_POSTGRES_WRITER_DB}
+        networks:
+            - docker_mainflux-base-net
+        volumes:
+            - mainflux-timescaledb-writer-volume:/var/lib/postgresql/data
+        ports:
+            - ${MF_POSTGRES_WRITER_DB_PORT}:6002
+
+    timescaledb-writer:
+        image: mainflux/postgres-writer:${MF_RELEASE_TAG}
+        container_name: mainflux-timescaledb-writer
+        depends_on:
+            - timescaledb
+        restart: on-failure
+        environment:
+            MF_NATS_URL: ${MF_NATS_URL}
+            MF_POSTGRES_WRITER_LOG_LEVEL: ${MF_POSTGRES_WRITER_LOG_LEVEL}
+            MF_POSTGRES_WRITER_PORT: ${MF_POSTGRES_WRITER_PORT}
+            MF_POSTGRES_WRITER_DB_HOST: timescaledb
+            MF_POSTGRES_WRITER_DB_PORT: ${MF_POSTGRES_WRITER_DB_PORT}
+            MF_POSTGRES_WRITER_DB_USER: ${MF_POSTGRES_WRITER_DB_USER}
+            MF_POSTGRES_WRITER_DB_PASS: ${MF_POSTGRES_WRITER_DB_PASS}
+            MF_POSTGRES_WRITER_DB: ${MF_POSTGRES_WRITER_DB}
+            MF_POSTGRES_WRITER_DB_SSL_MODE: ${MF_POSTGRES_WRITER_DB_SSL_MODE}
+            MF_POSTGRES_WRITER_DB_SSL_CERT: ${MF_POSTGRES_WRITER_DB_SSL_CERT}
+            MF_POSTGRES_WRITER_DB_SSL_KEY: ${MF_POSTGRES_WRITER_DB_SSL_KEY}
+            MF_POSTGRES_WRITER_DB_SSL_ROOT_CERT: ${MF_POSTGRES_WRITER_DB_SSL_ROOT_CERT}
+            MF_POSTGRES_WRITER_TRANSFORMER: ${MF_POSTGRES_WRITER_TRANSFORMER}
+        ports:
+            - ${MF_POSTGRES_WRITER_PORT}:${MF_POSTGRES_WRITER_PORT}
+        networks:
+            - docker_mainflux-base-net
+        volumes:
+            - ./config.toml:/config.toml
diff --git a/docker/addons/timescaledb-writer/tern.conf b/docker/addons/timescaledb-writer/tern.conf
new file mode 100644
index 0000000000..6b8ce2db02
--- /dev/null
+++ b/docker/addons/timescaledb-writer/tern.conf
@@ -0,0 +1,15 @@
+[database]
+# host is required (network host or path to Unix domain socket)
+host = timescaledb
+port = 5432
+# database is required
+database = mainflux
+# user defaults to OS user
+user = mainflux
+password = mainflux
+
+
+[data]
+# Any fields in the data section are available in migration templates
+# prefix = foo
+app_user = mainflux