diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
deleted file mode 100644
index 61d8516..0000000
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# For each AVSBus attached rail go back to using VOUT_COMMAND (PMBus voltage)
-# instead of AVSBus and do *not* update VOUT_COMMAND with last voltage sent via
-# AVSBus. This should be run after power-down. This is platform specific
-# settings  that must be updated/removed if not Swift.
-
-i2cset -y 9 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 9 0x70 0x01 0x80 b    # VDD 0
-i2cset -y 9 0x71 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 9 0x71 0x01 0x80 b    # VCS 0
-i2cset -y 9 0x71 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 9 0x71 0x01 0x80 b    # VDN 0
-i2cset -y 10 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 10 0x70 0x01 0x80 b    # VDD 1
-i2cset -y 10 0x71 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 10 0x71 0x01 0x80 b    # VCS 1
-i2cset -y 10 0x71 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 10 0x71 0x01 0x80 b    # VDN 1
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service
deleted file mode 100644
index fbab180..0000000
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Disable the AVS bus on the VRMs
-Before=vrm-control@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env avsbus-disable.sh
-SyslogIdentifier=avsbus-disable.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh
index d384091..7ff607a 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh
@@ -6,20 +6,15 @@
 # updated/removed if not Swift.
 
 i2cset -y 9 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 9 0x70 0x21 0xE6 0x00 i    # VDD 0  - Set default HW boot voltage to 0.9V
 i2cset -y 9 0x70 0x01 0xB0 b    # VDD 0
 i2cset -y 9 0x71 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 9 0x71 0x21 0x00 0x01 i    # VCS 0  - Set default HW boot voltage to 1.0V
 i2cset -y 9 0x71 0x01 0xB0 b    # VCS 0
 i2cset -y 9 0x71 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 9 0x71 0x21 0xCD 0x00 i    # VDN 0  - Set default HW boot voltage to 0.8V
 i2cset -y 9 0x71 0x01 0xB0 b    # VDN 0
+
 i2cset -y 10 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 10 0x70 0x21 0xE6 0x00 i    # VDD 1  - Set default HW boot voltage to 0.9V
 i2cset -y 10 0x70 0x01 0xB0 b    # VDD 1
 i2cset -y 10 0x71 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 10 0x71 0x21 0x00 0x01 i    # VCS 1  - Set default HW boot voltage to 1.0V
 i2cset -y 10 0x71 0x01 0xB0 b    # VCS 1
 i2cset -y 10 0x71 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 10 0x71 0x21 0xCD 0x00 i   # VDN 1  - Set default HW boot voltage to 0.8V
 i2cset -y 10 0x71 0x01 0xB0 b    # VDN 1
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service
new file mode 100644
index 0000000..45776aa
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Enable the AVS bus on VRMs
+Wants=op-power-start@%i.service
+Before=op-power-start@%i.service
+Conflicts=obmc-chassis-poweroff@%i.target
+ConditionPathExists=!/run/openbmc/chassis@%i-on
+
+[Service]
+ExecStart={bindir}/avsbus-enable.sh
+SyslogIdentifier=avsbus-enable.sh
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service