diff --git a/config/fluentd.jsonnet b/config/fluentd.jsonnet
index c4113213..823e1afc 100644
--- a/config/fluentd.jsonnet
+++ b/config/fluentd.jsonnet
@@ -12,6 +12,5 @@ local outputConf = std.strReplace(outputConfMissingZone, '{{GCE_ZONE}}', std.ext
     'containers.input.conf': importstr 'fluentd/containers.input.conf',
     'monitoring.conf': importstr 'fluentd/monitoring.conf',
     'output.conf': outputConf,
-    'system.input.conf': importstr 'fluentd/system.input.conf',
   },
 }
diff --git a/config/fluentd/containers.input.conf b/config/fluentd/containers.input.conf
index 0617690e..93ccc54f 100644
--- a/config/fluentd/containers.input.conf
+++ b/config/fluentd/containers.input.conf
@@ -66,19 +66,19 @@
 
 # Detect exceptions in the log output and forward them as one log entry.
 <match raw.kubernetes.**>
-  @type copy
+@type copy
 
   <store>
-    @type prometheus
+  @type prometheus
 
     <metric>
-      type counter
-      name logging_line_count
-      desc Total number of lines generated by application containers
-      <labels>
-        tag ${tag}
-      </labels>
-    </metric>
+    type counter
+    name logging_line_count
+    desc Total number of lines generated by application containers
+    <labels>
+      tag ${tag}
+    </labels>
+  </metric>
   </store>
   <store>
     @type detect_exceptions
@@ -90,4 +90,3 @@
     max_bytes 500000
     max_lines 1000
   </store>
-</match>
diff --git a/config/fluentd/output.conf.template b/config/fluentd/output.conf.template
index 632d6e9d..6c071dad 100644
--- a/config/fluentd/output.conf.template
+++ b/config/fluentd/output.conf.template
@@ -1,7 +1,4 @@
-# We use 2 output stanzas - one to handle the container logs and one to handle
-# the node daemon logs. This allows us to label Prometheus metrics differently
-# depending on the component ("container" or "system").
-<match kubernetes.**>
+<match **>
   @type copy
 
   <store>
@@ -53,41 +50,3 @@
     </metric>
   </store>
 </match>
-
-<match **>
-  @type copy
-
-  <store>
-    @type google_cloud
-    use_metadata_service false
-
-    project_id {{PROJECT_ID}}
-    zone {{GCE_ZONE}}
-    vm_id NODE_HOSTNAME
-    vm_name NODE_HOSTNAME
-
-    detect_subservice false
-    buffer_type file
-    buffer_path /var/log/fluentd-buffers/kubernetes.system.buffer
-    buffer_queue_full_action block
-    buffer_chunk_limit 2M
-    buffer_queue_limit 2
-    flush_interval 5s
-    max_retry_wait 30
-    disable_retry_limit
-    num_threads 2
-  </store>
-  <store>
-    @type prometheus
-
-    <metric>
-      type counter
-      name logging_entry_count
-      desc Total number of log entries generated by either an application container or a system component
-      <labels>
-        tag ${tag}
-        component system
-      </labels>
-    </metric>
-  </store>
-</match>
diff --git a/config/fluentd/system.input.conf b/config/fluentd/system.input.conf
deleted file mode 100644
index 3134a365..00000000
--- a/config/fluentd/system.input.conf
+++ /dev/null
@@ -1,132 +0,0 @@
-# Examples:
-# time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json"
-# time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404
-<source>
-  type tail
-  format /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
-  path /var/log/docker.log
-  pos_file /var/log/docker.log.pos
-  tag docker
-</source>
-
-# Example:
-# 2016/02/04 06:52:38 filePurge: successfully removed file /var/etcd/data/member/wal/00000000000006d0-00000000010a23d1.wal
-<source>
-  type tail
-  # Not parsing this, because it doesn't have anything particularly useful to
-  # parse out of it (like severities).
-  format none
-  path /var/log/etcd.log
-  pos_file /var/log/etcd.log.pos
-  tag etcd
-</source>
-
-# Multi-line parsing is required for all the kube logs because very large log
-# statements, such as those that include entire object bodies, get split into
-# multiple lines by glog.
-
-# Example:
-# I0204 07:32:30.020537    3368 server.go:1048] POST /stats/container/: (13.972191ms) 200 [[Go-http-client/1.1] 10.244.1.3:40537]
-<source>
-  type tail
-  format multiline
-  multiline_flush_interval 5s
-  format_firstline /^\w\d{4}/
-  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-  time_format %m%d %H:%M:%S.%N
-  path /var/log/kubelet.log
-  pos_file /var/log/kubelet.log.pos
-  tag kubelet
-</source>
-
-# Example:
-# I1118 21:26:53.975789       6 proxier.go:1096] Port "nodePort for kube-system/default-http-backend:http" (:31429/tcp) was open before and is still needed
-<source>
-  type tail
-  format multiline
-  multiline_flush_interval 5s
-  format_firstline /^\w\d{4}/
-  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-  time_format %m%d %H:%M:%S.%N
-  path /var/log/kube-proxy.log
-  pos_file /var/log/kube-proxy.log.pos
-  tag kube-proxy
-</source>
-
-# Example:
-# I0204 07:00:19.604280       5 handlers.go:131] GET /api/v1/nodes: (1.624207ms) 200 [[kube-controller-manager/v1.1.3 (linux/amd64) kubernetes/6a81b50] 127.0.0.1:38266]
-<source>
-  type tail
-  format multiline
-  multiline_flush_interval 5s
-  format_firstline /^\w\d{4}/
-  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-  time_format %m%d %H:%M:%S.%N
-  path /var/log/kube-apiserver.log
-  pos_file /var/log/kube-apiserver.log.pos
-  tag kube-apiserver
-</source>
-
-# Example:
-# 2017-02-09T00:15:57.992775796Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" ip="104.132.1.72" method="GET" user="kubecfg" as="<self>" asgroups="<lookup>" namespace="default" uri="/api/v1/namespaces/default/pods"
-# 2017-02-09T00:15:57.993528822Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" response="200"
-<source>
-  type tail
-  format multiline
-  multiline_flush_interval 5s
-  format_firstline /^\S+\s+AUDIT:/
-  # Fields must be explicitly captured by name to be parsed into the record.
-  # Fields may not always be present, and order may change, so this just looks
-  # for a list of key="\"quoted\" value" pairs separated by spaces.
-  # Unknown fields are ignored.
-  # Note: We can't separate query/response lines as format1/format2 because
-  #       they don't always come one after the other for a given query.
-  # TODO: Maybe add a JSON output mode to audit log so we can get rid of this?
-  format1 /^(?<time>\S+) AUDIT:(?: (?:id="(?<id>(?:[^"\\]|\\.)*)"|ip="(?<ip>(?:[^"\\]|\\.)*)"|method="(?<method>(?:[^"\\]|\\.)*)"|user="(?<user>(?:[^"\\]|\\.)*)"|groups="(?<groups>(?:[^"\\]|\\.)*)"|as="(?<as>(?:[^"\\]|\\.)*)"|asgroups="(?<asgroups>(?:[^"\\]|\\.)*)"|namespace="(?<namespace>(?:[^"\\]|\\.)*)"|uri="(?<uri>(?:[^"\\]|\\.)*)"|response="(?<response>(?:[^"\\]|\\.)*)"|\w+="(?:[^"\\]|\\.)*"))*/
-  time_format %FT%T.%L%Z
-  path /var/log/kube-apiserver-audit.log
-  pos_file /var/log/kube-apiserver-audit.log.pos
-  tag kube-apiserver-audit
-</source>
-
-# Example:
-# I0204 06:55:31.872680       5 servicecontroller.go:277] LB already exists and doesn't need update for service kube-system/kubernetes-dashboard
-<source>
-  type tail
-  format multiline
-  multiline_flush_interval 5s
-  format_firstline /^\w\d{4}/
-  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-  time_format %m%d %H:%M:%S.%N
-  path /var/log/kube-controller-manager.log
-  pos_file /var/log/kube-controller-manager.log.pos
-  tag kube-controller-manager
-</source>
-
-# Example:
-# W0204 06:49:18.239674       7 reflector.go:245] pkg/scheduler/factory/factory.go:193: watch of *api.Service ended with: 401: The event in requested index is outdated and cleared (the requested history has been cleared [2578313/2577886]) [2579312]
-<source>
-  type tail
-  format multiline
-  multiline_flush_interval 5s
-  format_firstline /^\w\d{4}/
-  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-  time_format %m%d %H:%M:%S.%N
-  path /var/log/kube-scheduler.log
-  pos_file /var/log/kube-scheduler.log.pos
-  tag kube-scheduler
-</source>
-
-# Example:
-# I1104 10:36:20.242766       5 rescheduler.go:73] Running Rescheduler
-<source>
-  type tail
-  format multiline
-  multiline_flush_interval 5s
-  format_firstline /^\w\d{4}/
-  format1 /^(?<severity>\w)(?<time>\d{4} [^\s]*)\s+(?<pid>\d+)\s+(?<source>[^ \]]+)\] (?<message>.*)/
-  time_format %m%d %H:%M:%S.%N
-  path /var/log/rescheduler.log
-  pos_file /var/log/rescheduler.log.pos
-  tag rescheduler
-</source>
diff --git a/k8s/daemonsets/core/fluentd.jsonnet b/k8s/daemonsets/core/fluentd.jsonnet
index 1fc653a7..18390e8d 100644
--- a/k8s/daemonsets/core/fluentd.jsonnet
+++ b/k8s/daemonsets/core/fluentd.jsonnet
@@ -46,7 +46,7 @@
             command: [
               '/bin/sh',
               '-c',
-              'mkdir /etc/fluent/config.d && cp /config/* /etc/fluent/config.d/ && sed -i "s/NODE_HOSTNAME/$NODE_HOSTNAME/" /etc/fluent/config.d/output.conf && /run.sh $FLUENTD_ARGS',
+              'mkdir /etc/fluent/config.d && cp /config/* /etc/fluent/config.d/ && sed -i "s/NODE_HOSTNAME/$NODE_HOSTNAME/" /etc/fluent/config.d/output.conf && /run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log',
             ],
             env: [
               {
@@ -66,7 +66,7 @@
                 },
               },
             ],
-            image: 'k8s.gcr.io/fluentd-gcp:2.0.2',
+            image: 'k8s.gcr.io/fluentd-gcp:2.1.1',
             name: 'fluentd',
             ports: [
               {