diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
index 0326c5846b0..666f84a649d 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
@@ -14,6 +14,9 @@ MAINTAINER Satnam Singh "satnam@google.com"
 # Ensure there are enough file descriptors for running Fluentd.
 RUN ulimit -n 65536
 
+# Disable prompts from apt.
+ENV DEBIAN_FRONTEND noninteractive
+
 # Install prerequisites.
 RUN apt-get update && \
     apt-get install -y curl && \
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
index 3a88a040772..0274144c79e 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
@@ -11,10 +11,9 @@ MAINTAINER Satnam Singh "satnam@google.com"
 
 # Disable prompts from apt.
 ENV DEBIAN_FRONTEND noninteractive
-ENV OPTS_APT -y --force-yes --no-install-recommends
 
 RUN apt-get -q update && \
-    apt-get -y install curl && \
+    apt-get install -y curl && \
     apt-get clean && \
     curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash
 
diff --git a/contrib/logging/fluentd-sidecar-es/Dockerfile b/contrib/logging/fluentd-sidecar-es/Dockerfile
index f6534e47c31..180a34ffc52 100644
--- a/contrib/logging/fluentd-sidecar-es/Dockerfile
+++ b/contrib/logging/fluentd-sidecar-es/Dockerfile
@@ -10,14 +10,16 @@
 FROM ubuntu:14.04
 MAINTAINER Alex Robinson "arob@google.com"
 
+# Ensure there are enough file descriptors for running Fluentd.
+RUN ulimit -n 65536
+
 # Disable prompts from apt.
 ENV DEBIAN_FRONTEND noninteractive
-ENV OPTS_APT -y --force-yes --no-install-recommends
 
 # Install the standard, official Fluentd agent (called td-agent, for the
 # project's parent company, Treasure Data).
 RUN apt-get -q update && \
-    apt-get -y install curl && \
+    apt-get install -y curl && \
     apt-get install -y -q libcurl4-openssl-dev make && \
     apt-get clean
 RUN /usr/bin/curl -L http://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent2.sh | sh
diff --git a/contrib/logging/fluentd-sidecar-gcp/Dockerfile b/contrib/logging/fluentd-sidecar-gcp/Dockerfile
index 4263efb87d1..fff5efaa867 100644
--- a/contrib/logging/fluentd-sidecar-gcp/Dockerfile
+++ b/contrib/logging/fluentd-sidecar-gcp/Dockerfile
@@ -13,11 +13,10 @@ MAINTAINER Alex Robinson "arob@google.com"
 
 # Disable prompts from apt.
 ENV DEBIAN_FRONTEND noninteractive
-ENV OPTS_APT -y --force-yes --no-install-recommends
 
 # Install the Fluentd agent that knows how to send logs to Google Cloud Logging.
 RUN apt-get -q update && \
-    apt-get -y install curl && \
+    apt-get install -y curl && \
     apt-get clean && \
     curl -s https://storage.googleapis.com/signals-agents/logging/google-fluentd-install.sh | sudo bash