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 81638f49f4..14161d6575 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
@@ -28,26 +28,6 @@ coreos:
 
           [Service]
           ExecStart=/usr/share/oem/bin/nova-agent-watcher -watch-dir=/usr/share/oem/nova-agent -scripts-dir=/usr/share/oem/bin/
-      - name: media-configdrive.mount
-        command: restart
-        runtime: yes
-        content: |
-          [Mount]
-          What=/dev/disk/by-label/config-2
-          Where=/media/configdrive
-      - name: cloudinit-configdrive.service
-        command: restart
-        runtime: yes
-        content: |
-          [Unit]
-          RequiresMountsFor=/media/configdrive
-          Requires=coreos-setup-environment.service
-          After=coreos-setup-environment.service
-
-          [Service]
-          Type=oneshot
-          EnvironmentFile=/etc/environment
-          ExecStart=/usr/bin/coreos-cloudinit --from-file=/media/configdrive/openstack/latest/user_data
     oem:
       id: rackspace
       name: Rackspace Cloud Servers
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r8.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r8.ebuild