diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml
index b65b431610..6aa595889c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml
@@ -10,6 +10,14 @@ coreos:
             [Service]
             Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
 
+    - name: etcd2.service
+      runtime: true
+      drop-ins:
+        - name: 10-oem.conf
+          content: |
+            [Service]
+            Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
+
     - name: waagent.service
       command: start
       runtime: true
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
index ccdf30eba1..e4a20e9f1a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
@@ -10,6 +10,14 @@ coreos:
             [Service]
             Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
 
+    - name: etcd2.service
+      runtime: true
+      drop-ins:
+        - name: 10-oem.conf
+          content: |
+            [Service]
+            Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
+
     - name: oem-cloudinit.service
       command: restart
       runtime: yes
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml
index 39398b758e..d631e625e7 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml
@@ -10,6 +10,14 @@ coreos:
             [Service]
             Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
 
+    - name: etcd2.service
+      runtime: true
+      drop-ins:
+        - name: 10-oem.conf
+          content: |
+            [Service]
+            Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
+
     - name: user-configdrive.service
       mask: yes
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
index 87727b157d..b2e5969f67 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml
@@ -10,6 +10,14 @@ coreos:
             [Service]
             Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
 
+    - name: etcd2.service
+      runtime: true
+      drop-ins:
+        - name: 10-oem.conf
+          content: |
+            [Service]
+            Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
+
     - name: nova-agent-auto.service
       command: restart
       runtime: yes