diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index e654cdcdcca..213381e5db3 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -1,7 +1,7 @@
 .PHONY:	build push
 
 IMAGE = fluentd-elasticsearch
-TAG = 1.5
+TAG = 1.6
 
 build:	
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
index 908655e8a73..f34a79b0544 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -78,19 +78,21 @@
   tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
 </match>
 
-<match kubernetes.**>
-   type elasticsearch
-   log_level info
-   include_tag_key true
-   host elasticsearch-logging.default
-   port 9200
-   logstash_format true
-   flush_interval 5s
-   # Never wait longer than 5 minutes between retries.
-   max_retry_wait 300
-   # Disable the limit on the number of retries (retry forever).
-   disable_retry_limit
-</match>
+<source>
+  type tail
+  format none
+  path /varlog/startupscript.log
+  pos_file /varlog/es-startupscript.log.pos
+  tag startupscript
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/docker.log
+  pos_file /varlog/es-docker.log.pos
+  tag docker
+</source>
 
 <source>
   type tail
@@ -100,11 +102,35 @@
   tag kubelet
 </source>
 
-<match kubelet>
+<source>
+  type tail
+  format none
+  path /varlog/kube-apiserver.log
+  pos_file /varlog/es-kube-apiserver.log.pos
+  tag kube-apiserver
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/kube-controller-manager.log
+  pos_file /varlog/es-kube-controller-manager.log.pos
+  tag kube-controller-manager
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/kube-scheduler.log
+  pos_file /varlog/es-kube-scheduler.log.pos
+  tag kube-scheduler
+</source>
+
+<match **>
    type elasticsearch
    log_level info
    include_tag_key true
-   host elasticsearch-logging.default
+   host elasticsearch-logging
    port 9200
    logstash_format true
    flush_interval 5s
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index 19d5ea704ae..d0ba196a67b 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -15,7 +15,7 @@
 
 .PHONY:	kbuild kpush
 
-TAG = 1.7
+TAG = 1.8
 
 # Rules for building the test image for deployment to Dockerhub with user kubernetes.
 
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
index 5aa7b6d450a..02615d1db79 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -63,25 +63,55 @@
   tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
 </match>
 
-<match kubernetes.**>
-  type google_cloud
-  flush_interval 5s
-  # Never wait longer than 5 minutes between retries.
-  max_retry_wait 300
-  # Disable the limit on the number of retries (retry forever).
-  disable_retry_limit
-</match>
+<source>
+  type tail
+  format none
+  path /varlog/startupscript.log
+  pos_file /varlog/gcp-startupscript.log.pos
+  tag startupscript
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/docker.log
+  pos_file /varlog/gcp-docker.log.pos
+  tag docker
+</source>
 
 <source>
   type tail
   format none
-  time_key time
   path /varlog/kubelet.log
   pos_file /varlog/gcp-kubelet.log.pos
   tag kubelet
 </source>
 
-<match kubelet>
+<source>
+  type tail
+  format none
+  path /varlog/kube-apiserver.log
+  pos_file /varlog/gcp-kube-apiserver.log.pos
+  tag kube-apiserver
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/kube-controller-manager.log
+  pos_file /varlog/gcp-kube-controller-manager.log.pos
+  tag kube-controller-manager
+</source>
+
+<source>
+  type tail
+  format none
+  path /varlog/kube-scheduler.log
+  pos_file /varlog/gcp-kube-scheduler.log.pos
+  tag kube-scheduler
+</source>
+
+<match **>
   type google_cloud
   flush_interval 5s
   # Never wait longer than 5 minutes between retries.