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
deleted file mode 100644
index 4de04f2cd4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-#cloud-config
-
-coreos:
-  units:
-    - name: etcd.service
-      runtime: true
-      drop-ins:
-        - name: 10-oem.conf
-          content: |
-            [Service]
-            Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
-
-    - name: etcd2.service
-      runtime: true
-      drop-ins:
-        - name: 10-oem.conf
-          content: |
-            [Service]
-            Environment=ETCD_ELECTION_TIMEOUT=1200
-
-    - name: waagent.service
-      command: start
-      runtime: true
-      content: |
-        [Unit]
-        Description=Microsoft Azure Agent
-        Wants=network-online.target sshd-keygen.service
-        After=network-online.target sshd-keygen.service
-
-        [Service]
-        Type=simple
-        Restart=always
-        RestartSec=5s
-        ExecStart=/usr/share/oem/python/bin/python -u /usr/share/oem/bin/waagent -daemon
-
-    - name: oem-cloudinit.service
-      command: restart
-      runtime: yes
-      content: |
-        [Unit]
-        Description=Cloudinit from Azure metadata
-
-        [Service]
-        Type=oneshot
-        ExecStart=/usr/bin/coreos-cloudinit --oem=azure
-
-  oem:
-    id: azure
-    name: Microsoft Azure
-    version-id: @@OEM_VERSION_ID@@
-    home-url: https://azure.microsoft.com/
-    bug-report-url: https://issues.coreos.com
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release
new file mode 100644
index 0000000000..63f82f9647
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/oem-release
@@ -0,0 +1,5 @@
+ID=azure
+VERSION_ID=@@OEM_VERSION_ID@@
+NAME="Microsoft Azure"
+HOME_URL="https://azure.microsoft.com/"
+BUG_REPORT_URL="https://issues.coreos.com"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/units/waagent.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/units/waagent.service
new file mode 100644
index 0000000000..9f7c4fd9ca
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/units/waagent.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Microsoft Azure Agent
+Wants=network-online.target sshd-keygen.service
+After=network-online.target sshd-keygen.service
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=5s
+ExecStart=/usr/share/oem/python/bin/python -u /usr/share/oem/bin/waagent -daemon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r1.ebuild
index b82f5edc07..bdfe838408 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r1.ebuild
@@ -18,12 +18,13 @@ S="${WORKDIR}"
 RDEPEND="~app-emulation/wa-linux-agent-${PV}"
 
 src_prepare() {
-    sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
-        "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die
+	sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
+		"${FILESDIR}/oem-release" > "${T}/oem-release" || die
 }
 
 src_install() {
 	insinto "/usr/share/oem"
-	doins "${T}/cloud-config.yml"
 	doins "${FILESDIR}/grub.cfg"
+	doins "${T}/oem-release"
+	doins -r "${FILESDIR}/units"
 }