diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
index 7b909d1..edf6697 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
@@ -3,5 +3,6 @@
 After=obmc-power-stop-pre@%i.target
 Wants={SYSTEMD_DEFAULT_TARGET}
 Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=fsi-disable.service
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-phosphor/chassis/obmc-fsi-scan.bb b/common/recipes-phosphor/chassis/obmc-fsi-scan.bb
deleted file mode 100644
index 4a4fdd7..0000000
--- a/common/recipes-phosphor/chassis/obmc-fsi-scan.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Scan for FSI devices"
-DESCRIPTION = "Tells the OpenFSI device driver to scan for FSI devices"
-PR = "r1"
-
-inherit obmc-phosphor-dbus-service
-inherit obmc-phosphor-license
-
-TMPL = "fsi-scan@.service"
-INSTFMT = "fsi-scan@{0}.service"
-TGTFMT = "obmc-power-chassis-on@{0}.target"
-FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SUBSTITUTIONS += "MACHINE:${MACHINE}:${TMPL}"
diff --git a/common/recipes-phosphor/chassis/obmc-fsi.bb b/common/recipes-phosphor/chassis/obmc-fsi.bb
new file mode 100644
index 0000000..37a326f
--- /dev/null
+++ b/common/recipes-phosphor/chassis/obmc-fsi.bb
@@ -0,0 +1,21 @@
+SUMMARY = "FSI Services"
+DESCRIPTION = "Install FSI related services"
+PR = "r1"
+
+inherit obmc-phosphor-systemd
+inherit obmc-phosphor-license
+
+TGTFMT = "obmc-power-chassis-on@{0}.target"
+
+TMPL_SCAN = "fsi-scan@.service"
+INSTFMT_SCAN = "fsi-scan@{0}.service"
+FMT_SCAN = "../${TMPL_SCAN}:${TGTFMT}.requires/${INSTFMT_SCAN}"
+
+TMPL_BIND = "fsi-bind@.service"
+INSTFMT_BIND = "fsi-bind@{0}.service"
+FMT_BIND = "../${TMPL_BIND}:${TGTFMT}.requires/${INSTFMT_BIND}"
+
+SYSTEMD_SERVICE_${PN} += "${TMPL_SCAN} ${TMPL_BIND} fsi-enable.service fsi-disable.service"
+
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_BIND', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service
new file mode 100644
index 0000000..77c61f4
--- /dev/null
+++ b/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Bind FSI Driver
+Wants=obmc-power-on@%i.target
+After=obmc-power-on@%i.target
+Wants=obmc-host-start-pre@%i.target
+Before=obmc-host-start-pre@%i.target
+Wants=fsi-scan@%i.service
+Before=fsi-scan@%i.service
+Conflicts=obmc-power-chassis-off@%i.target
+ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
+
+[Service]
+ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind"
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+RequiredBy=obmc-power-chassis-on@%i.target
diff --git a/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service
new file mode 100644
index 0000000..a58af04
--- /dev/null
+++ b/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Disable FSI
+Conflicts=fsi-enable.service
+
+[Service]
+ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/unbind"
+Type=oneshot
+RemainAfterExit=yes
diff --git a/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service
new file mode 100644
index 0000000..c5b1ea1
--- /dev/null
+++ b/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Enable FSI
+Conflicts=fsi-disable.service
+ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
+
+[Service]
+ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind"
+ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
+Type=oneshot
+RemainAfterExit=yes
diff --git a/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service b/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service
similarity index 88%
rename from common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service
rename to common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service
index ca19f1d..8f94e28 100644
--- a/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service
+++ b/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service
@@ -5,7 +5,6 @@
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
 Conflicts=obmc-power-chassis-off@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
 ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"