diff --git a/cluster/images/etcd/Dockerfile b/cluster/images/etcd/Dockerfile
new file mode 100644
index 00000000000..253d1403abd
--- /dev/null
+++ b/cluster/images/etcd/Dockerfile
@@ -0,0 +1,5 @@
+FROM scratch
+MAINTAINER  Dawn Chen <dawnchen@google.com>
+
+ADD ./etcd /usr/local/bin/etcd
+ADD ./etcdctl /usr/local/bin/etcdctl
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
new file mode 100644
index 00000000000..e322374927c
--- /dev/null
+++ b/cluster/images/etcd/Makefile
@@ -0,0 +1,20 @@
+.PHONY:	clean build push
+
+IMAGE = etcd
+TAG = 2.0.8
+OUTPUT_DIR = $(IMAGE)-v$(TAG)-linux-amd64
+
+clean:
+	rm -rf $(OUTPUT_DIR) $(IMAGE)-v$(TAG)-linux-amd64.tar.gz etcd etcdctl
+
+build: clean
+	curl -L -O https://github.com/coreos/etcd/releases/download/v$(TAG)/$(IMAGE)-v$(TAG)-linux-amd64.tar.gz
+	tar xzvf $(IMAGE)-v$(TAG)-linux-amd64.tar.gz
+	cp $(OUTPUT_DIR)/etcd .
+	cp $(OUTPUT_DIR)/etcdctl .
+	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
+
+push:	build
+	gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
+
+all:	push