diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in b/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
index d5f02db7766..af3ba63674b 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
@@ -12,7 +12,7 @@ desiredState:
         id: es-log-ingestion
         containers:
           - name: elasticsearch-logging
-            image: dockerfile/elasticsearch
+            image: kubernetes/elasticsearch:1.0
             ports:
               - name: es-port
                 containerPort: 9200
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
new file mode 100644
index 00000000000..e7d6da06591
--- /dev/null
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
@@ -0,0 +1,27 @@
+# A Dockerfile for creating an Elasticsearch instance that is designed
+# to work with Kubernetes logging. Inspired by the Dockerfile
+# dockerfile/elasticsearch
+
+FROM dockerfile/java:openjdk-7-jre
+MAINTAINER Satnam Singh "satnam@google.com"
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && \
+    apt-get install -y curl && \
+    apt-get clean
+
+RUN cd / && \
+    curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.4.tar.gz && \
+    tar xf elasticsearch-1.4.4.tar.gz && \
+    mv elasticsearch-1.4.4 /elasticsearch && \
+    rm -rf elasticsearch-1.4.4.tar.gz
+
+ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml
+
+VOLUME ["/data"]
+WORKDIR /data
+CMD ["/elasticsearch/bin/elasticsearch"]
+
+EXPOSE 9200
+EXPOSE 9300
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
new file mode 100755
index 00000000000..6c22e570f19
--- /dev/null
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -0,0 +1,9 @@
+.PHONY:	build push
+
+TAG = 1.0
+
+build:	
+	docker build -t kubernetes/elasticsearch:$(TAG) .
+
+push:	
+	docker push kubernetes/elasticsearch:$(TAG)
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml
new file mode 100644
index 00000000000..a966252cf26
--- /dev/null
+++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml
@@ -0,0 +1,7 @@
+path:
+  data: /data/data
+  logs: /data/log
+  plugins: /data/plugins
+  work: /data/work
+cluster:
+  name: kubernetes_logging