diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.4-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.0.5.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index a149b478af..b459bcbb6b 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -14,7 +14,7 @@ inherit coreos-doc coreos-go toolchain-funcs cros-workon systemd
 if [[ "${PV}" == 9999 ]]; then
     KEYWORDS="~amd64"
 else
-    CROS_WORKON_COMMIT="1a2c6d3f2fbcb047712bfa3234bff5b9d07bdc57" # v2.0.4
+    CROS_WORKON_COMMIT="9481945228b97c5d019596b921d8b03833964d9e" # v2.0.5
     KEYWORDS="amd64"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
index 260c89a170..67f6d2c322 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
@@ -13,7 +13,7 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE"
 # via use flags because if two versions are installed one must provide
 # the "default" /usr/bin/etcd binary and systemd services.
 USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS"
-ETCD_PROTOCOLS="1"
+ETCD_PROTOCOLS="1 2"
 
 # Extra use flags for CoreOS SDK
 USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb"