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 3477eb670c..52763d4b82 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
@@ -1,9 +1,27 @@
 #cloud-config
 
 coreos:
-    oem:
-      id: azure
-      name: Microsoft Azure
-      version-id: @@OEM_VERSION_ID@@
-      home-url: https://azure.microsoft.com/
-      bug-report-url: https://github.com/coreos/bugs/issues
+  units:
+    - name: user-cloudinit@var-lib-waagent-CustomData.path
+      command: start
+      runtime: true
+
+    - 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
+        ExecStart=/usr/share/oem/python/bin/python /usr/share/oem/bin/waagent -daemon
+
+  oem:
+    id: azure
+    name: Microsoft Azure
+    version-id: @@OEM_VERSION_ID@@
+    home-url: https://azure.microsoft.com/
+    bug-report-url: https://github.com/coreos/bugs/issues
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r2.ebuild
similarity index 92%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r2.ebuild
index 803b976595..e670ec9dc8 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r2.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 # no source directory
 S="${WORKDIR}"
 
-RDEPEND="dev-lang/python-oem"
+RDEPEND="app-emulation/wa-linux-agent"
 
 src_prepare() {
     sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \