diff --git a/compose/docker-compose-chameleon-swarm.yml b/compose/docker-compose-chameleon-swarm.yml
index 9e27ffe..0bfbd15 100644
--- a/compose/docker-compose-chameleon-swarm.yml
+++ b/compose/docker-compose-chameleon-swarm.yml
@@ -16,6 +16,11 @@
     image: cord/chameleon:latest
     deploy:
       mode: global
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     environment:
       SERVICE_8881_NAME: "chameleon-rest"
     entrypoint:
diff --git a/compose/docker-compose-consul-cluster.yml b/compose/docker-compose-consul-cluster.yml
index 78f83e1..5bd37b9 100644
--- a/compose/docker-compose-consul-cluster.yml
+++ b/compose/docker-compose-consul-cluster.yml
@@ -16,6 +16,11 @@
 
   consul:
     image: consul:0.9.2
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
 
     # Deploy to all docker manager nodes
     deploy:
diff --git a/compose/docker-compose-envoy-swarm.yml b/compose/docker-compose-envoy-swarm.yml
index 5c14cfa..b9e905d 100644
--- a/compose/docker-compose-envoy-swarm.yml
+++ b/compose/docker-compose-envoy-swarm.yml
@@ -11,6 +11,11 @@
 services:
   voltha:
     image: voltha/envoy:latest
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 1
     environment:
diff --git a/compose/docker-compose-fluentd-agg-cluster.yml b/compose/docker-compose-fluentd-agg-cluster.yml
index 3c6bafe..9f82fa4 100644
--- a/compose/docker-compose-fluentd-agg-cluster.yml
+++ b/compose/docker-compose-fluentd-agg-cluster.yml
@@ -14,6 +14,11 @@
 
   fluentdactv:
     image: cord/fluentd
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 1
       restart_policy:
@@ -29,6 +34,11 @@
 
   fluentdstby:
     image: cord/fluentd
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 1
       restart_policy:
diff --git a/compose/docker-compose-fluentd-cluster.yml b/compose/docker-compose-fluentd-cluster.yml
index f8250a2..dead717 100644
--- a/compose/docker-compose-fluentd-cluster.yml
+++ b/compose/docker-compose-fluentd-cluster.yml
@@ -14,6 +14,11 @@
 
   fluentd:
     image: cord/fluentd
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       mode: replicated
       replicas: 2
diff --git a/compose/docker-compose-grafana-swarm.yml b/compose/docker-compose-grafana-swarm.yml
index f0da980..0ff00de 100644
--- a/compose/docker-compose-grafana-swarm.yml
+++ b/compose/docker-compose-grafana-swarm.yml
@@ -13,6 +13,11 @@
 services:
   grafana:
     image: kamon/grafana_graphite
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 1
     environment:
diff --git a/compose/docker-compose-kafka-cluster.yml b/compose/docker-compose-kafka-cluster.yml
index b850932..1c2dbb2 100644
--- a/compose/docker-compose-kafka-cluster.yml
+++ b/compose/docker-compose-kafka-cluster.yml
@@ -17,6 +17,11 @@
 services:
     zk1:
         image: zookeeper
+        logging:
+            driver: "json-file"
+            options:
+               max-size: "10m"
+               max-file: 3
         networks:
             - net
         environment:
@@ -25,6 +30,11 @@
 
     zk2:
         image: zookeeper
+        logging:
+            driver: "json-file"
+            options:
+                max-size: "10m"
+                max-file: 3
         networks:
             - net
         environment:
@@ -33,6 +43,11 @@
 
     zk3:
         image: zookeeper
+        logging:
+            driver: "json-file"
+            options:
+                max-size: "10m"
+                max-file: 3
         networks:
             - net
         environment:
@@ -43,6 +58,11 @@
         deploy:
             mode: global
         image: wurstmeister/kafka
+        logging:
+            driver: "json-file"
+            options:
+                max-size: "10m"
+                max-file: 3
         environment:
             KAFKA_ADVERTISED_PORT: 9092
             KAFKA_ZOOKEEPER_CONNECT: zk1:2181,zk2:2181,zk3:2181
diff --git a/compose/docker-compose-netconf-swarm.yml b/compose/docker-compose-netconf-swarm.yml
index ed39a27..3259c47 100644
--- a/compose/docker-compose-netconf-swarm.yml
+++ b/compose/docker-compose-netconf-swarm.yml
@@ -14,6 +14,11 @@
 services:
   netconf:
     image: cord/netconf:latest
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       mode: global
     environment:
diff --git a/compose/docker-compose-ofagent-swarm.yml b/compose/docker-compose-ofagent-swarm.yml
index dee18cc..7342114 100644
--- a/compose/docker-compose-ofagent-swarm.yml
+++ b/compose/docker-compose-ofagent-swarm.yml
@@ -10,6 +10,11 @@
 services:
     ofagent:
         image: cord/ofagent
+        logging:
+           driver: "json-file"
+            options:
+                max-size: "10m"
+                max-file: 3
         deploy:
             replicas: 3
         entrypoint:
diff --git a/compose/docker-compose-onos-swarm.yml b/compose/docker-compose-onos-swarm.yml
index 54d43ed..75a6296 100644
--- a/compose/docker-compose-onos-swarm.yml
+++ b/compose/docker-compose-onos-swarm.yml
@@ -12,6 +12,11 @@
         deploy:
             replicas: 1
         image: "marcelmaatkamp/freeradius"
+        logging:
+            driver: "json-file"
+            options:
+                max-size: "10m"
+                max-file: 3
         ports:
             - "1812:1812/udp"
             - "1813:1813"
@@ -29,6 +34,11 @@
             # needs to be configured through onos 
            replicas: 1
         image: "cord/onos"
+        logging:
+            driver: "json-file"
+            options:
+                max-size: "10m"
+                max-file: 3
         ports:
             - 8101:8101 # ssh
             - 6653:6653 # OF
diff --git a/compose/docker-compose-registry.yml b/compose/docker-compose-registry.yml
index 8804259..dc6bb91 100644
--- a/compose/docker-compose-registry.yml
+++ b/compose/docker-compose-registry.yml
@@ -9,6 +9,11 @@
 services:
   registry:
     image: registry:2
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     restart: always
     deploy:
       replicas: 1
diff --git a/compose/docker-compose-stats-swarm.yml b/compose/docker-compose-stats-swarm.yml
index 86645a8..447be5c 100644
--- a/compose/docker-compose-stats-swarm.yml
+++ b/compose/docker-compose-stats-swarm.yml
@@ -16,6 +16,11 @@
 services:
   dashd:
     image: cord/dashd
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 1
     entrypoint:
@@ -30,6 +35,11 @@
 
   shovel:
     image: cord/shovel
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 1
     entrypoint:
diff --git a/compose/docker-compose-vcli.yml b/compose/docker-compose-vcli.yml
index 3e543a5..553fc14 100644
--- a/compose/docker-compose-vcli.yml
+++ b/compose/docker-compose-vcli.yml
@@ -11,6 +11,11 @@
 services:
   cli:
     image: cord/vcli:latest
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 2
     environment:
diff --git a/compose/docker-compose-voltha-swarm.yml b/compose/docker-compose-voltha-swarm.yml
index 7826e39..bff9f90 100644
--- a/compose/docker-compose-voltha-swarm.yml
+++ b/compose/docker-compose-voltha-swarm.yml
@@ -2,6 +2,11 @@
 services:
   vcore:
     image: cord/voltha:latest
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: 3
     deploy:
       replicas: 3
     entrypoint: