diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml
index 930daffa02..ce775852f0 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/cloud-config.yml
@@ -47,8 +47,7 @@ coreos:
           Type=oneshot
           RemainAfterExit=yes
           ExecStart=/usr/bin/systemctl stop systemd-networkd
-          ExecStart=/usr/bin/bash -c "for dev in $(ip link show | gawk -F ':' '/^[0-9]+/ { print $2 }' | tr -d ' ' | sed 's/lo//'); do ip link set $dev down; done"
-          ExecStart=/usr/bin/bash -c "udevadm test /sys/class/net/*"
+          ExecStart=/usr/share/oem/bin/rename-interfaces.sh
           ExecStart=/usr/bin/systemctl start systemd-networkd
       - name: media-configdrive.mount
         command: start
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/rename-interfaces.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/rename-interfaces.sh
new file mode 100644
index 0000000000..9b96c3222b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/files/rename-interfaces.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+INTERFACES=$(ip link show | gawk -F ':' '/^[0-9]+/ { print $2 }' | tr -d ' ' | sed 's/lo//')
+for iface in ${INTERFACES}; do
+	ip link set ${iface} down
+	udevadm test /sys/class/net/${iface}
+done
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/oem-rackspace-teeth-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/oem-rackspace-teeth-0.0.3.ebuild
similarity index 91%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/oem-rackspace-teeth-0.0.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/oem-rackspace-teeth-0.0.3.ebuild
index 74768cd48c..b081c79f5a 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/oem-rackspace-teeth-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-teeth/oem-rackspace-teeth-0.0.3.ebuild
@@ -17,6 +17,7 @@ S="${WORKDIR}"
 src_install() {
 	into "/usr/share/oem"
 	dobin ${FILESDIR}/netname.sh
+	dobin ${FILESDIR}/rename-interfaces.sh
 
 	insinto "/usr/share/oem"
 	doins ${FILESDIR}/cloud-config.yml