diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
index d0f1e42979b..25c8a120271 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
@@ -21,6 +21,8 @@
 
 FROM debian:stretch-slim
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY clean-apt /usr/bin
 COPY clean-install /usr/bin
 COPY Gemfile /Gemfile
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
index 1fab8f51f78..9e45e486d1d 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'fluentd', '~>0.12.32'
-gem 'activesupport', '~>4.2.6'
-gem 'fluent-plugin-kubernetes_metadata_filter', '~>0.27.0'
-gem 'fluent-plugin-elasticsearch', '~>1.9.5'
-gem 'fluent-plugin-systemd', '~>0.0.8'
-gem 'fluent-plugin-detect-exceptions', '~>0.0.8'
+gem 'fluentd', '<=1.1.0'
+gem 'activesupport', '~>5.1.4'
+gem 'fluent-plugin-kubernetes_metadata_filter', '~>1.0.0'
+gem 'fluent-plugin-elasticsearch', '~>2.4.1'
+gem 'fluent-plugin-systemd', '~>0.3.1'
+gem 'fluent-plugin-detect-exceptions', git: 'https://github.com/monotek/fluent-plugin-detect-exceptions'
 gem 'fluent-plugin-prometheus', '~>0.3.0'
-gem 'fluent-plugin-multi-format-parser', '~>0.1.1'
-gem 'oj', '~>2.18.1'
+gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
+gem 'oj', '~>3.3.1.0'
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index 0b5fa8a487c..651e6e0d50c 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -16,7 +16,7 @@
 
 PREFIX = gcr.io/google-containers
 IMAGE = fluentd-elasticsearch
-TAG = v2.0.2
+TAG = v2.0.4
 
 build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/fluent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/fluent.conf
index a73db5d7c70..646d5288c4c 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/fluent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/fluent.conf
@@ -2,7 +2,7 @@
 
 # Do not collect fluentd's own logs to avoid infinite loops.
 <match fluent.**>
-  type null
+  @type null
 </match>
 
 @include /etc/fluent/config.d/*.conf