diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 3e614a60821..2e23516c161 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -1,8 +1,8 @@
 .PHONY:	clean build push
 
 IMAGE = etcd
-TAG = 2.0.9.1
-ETCD_VERSION = 2.0.9
+TAG = 2.0.12
+ETCD_VERSION = 2.0.12
 OUTPUT_DIR = $(IMAGE)-v$(ETCD_VERSION)-linux-amd64
 
 clean:
@@ -16,6 +16,6 @@ build: clean
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
 
 push: build
-	gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
+	gcloud docker push gcr.io/google_containers/$(IMAGE):$(TAG)
 
 all:	push
diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest
index 41aafc16f00..188ec8d7ab2 100644
--- a/cluster/saltbase/salt/etcd/etcd.manifest
+++ b/cluster/saltbase/salt/etcd/etcd.manifest
@@ -7,7 +7,7 @@
 "containers":[
     {
     "name": "etcd-container",
-    "image": "gcr.io/google_containers/etcd:2.0.9",
+    "image": "gcr.io/google_containers/etcd:2.0.12",
     "command": [
               "/usr/local/bin/etcd",
 	      "--addr",