diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 18814f1e..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-###
-# Copyright (c) Mainflux
-#
-# Mainflux server is licensed under an Apache license, version 2.0 license.
-# All rights not explicitly granted in the Apache license, version 2.0 are reserved.
-# See the included LICENSE file for more details.
-###
-
-###
-# MongoDB
-###
-mongo:
-  image: mongo:latest
-  container_name: mainflux-mongodb
-  command: --smallfiles --nojournal
-
-###
-# Mainflux Lite
-###
-mainflux-lite:
-  image: mainflux/mainflux-lite:latest
-  container_name: mainflux-lite
-  links:
-    - mongo
-  ports:
-    - "7070:7070"
-
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 60%
rename from Dockerfile
rename to docker/Dockerfile
index a76aab6d..0a518cf8 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -12,19 +12,19 @@ MAINTAINER Mainflux
 RUN apk update && apk add git && rm -rf /var/cache/apk/*
 
 # Copy the local package files to the container's workspace.
-ADD . /go/src/github.com/mainflux/mainflux-lite
+ADD . /go/src/github.com/mainflux/mainflux
 
-RUN mkdir -p /config/lite
-COPY config/config-docker.yml /config/lite/config.yml
+RUN mkdir -p /etc/mainflux
+COPY config/config-docker.toml /etc/mainflux/config.toml
 
 # Get and install the dependencies
-RUN go get github.com/mainflux/mainflux-lite
+RUN go get github.com/mainflux/mainflux
 
 ###
 # Run main command from entrypoint and parameters in CMD[]
 ###
-CMD ["/config/lite/config.yml"]
+CMD ["/etc/mainflux/config.toml"]
 
 # Run mainflux command by default when the container starts.
-ENTRYPOINT ["/go/bin/mainflux-lite"]
+ENTRYPOINT ["/go/bin/mainflux"]
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 00000000..f9b6fad0
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,49 @@
+###
+# Copyright (c) Mainflux
+#
+# Mainflux server is licensed under an Apache license, version 2.0 license.
+# All rights not explicitly granted in the Apache license, version 2.0 are reserved.
+# See the included LICENSE file for more details.
+###
+
+###
+# InfluxDB
+###
+#influx:
+#  image: influxdb:latest
+#  container_name: mainflux-influxdb
+#  ports:
+#    - "8083:8083"
+#    - "8086:8086"
+
+###
+# MongoDB
+###
+mongo:
+  image: mongo:latest
+  container_name: mainflux-mongodb
+  command: --smallfiles --nojournal
+
+###
+# Emqttd
+###
+emqttd:
+  image: mainflux/emqttd-docker:latest
+  container_name: mainflux-emqttd
+  ports:
+    - "1883:1883"
+    - "8083:8083"
+    - "18083:18083"
+
+###
+# Mainflux Core Server
+###
+mainflux-server:
+  image: mainflux/mainflux:latest
+  container_name: mainflux-server
+  links:
+    - influx
+    - mongo
+    - emdttd
+
+