diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
index 82399ae..3e85648 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
@@ -8,9 +8,10 @@
 Before=fsi-scan@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
+ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/gpio-fsi
 
 [Service]
-ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind"
+ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/bind"
 Type=oneshot
 RemainAfterExit=yes
 
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
index aa0b2e3..5b353cc 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
@@ -4,6 +4,6 @@
 
 [Service]
 ExecStart=/usr/sbin/openpower-proc-control setSyncFSIClock
-ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/unbind"
+ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/unbind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/unbind"
 Type=oneshot
 RemainAfterExit=yes
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
index c5b1ea1..3dd068e 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
@@ -2,9 +2,10 @@
 Description=Enable FSI
 Conflicts=fsi-disable.service
 ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
+ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/gpio-fsi
 
 [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"
+ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/bind"
+ExecStart=/bin/sh -c "if [ -f /sys/bus/platform/devices/gpio-fsi/fsi0/rescan ]; then echo 1 > /sys/bus/platform/devices/gpio-fsi/fsi0/rescan; else echo 1 > /sys/bus/platform/devices/fsi-master/scan; fi"
 Type=oneshot
 RemainAfterExit=yes
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index 4321422..c8db153 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -7,7 +7,7 @@
 Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
-ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
+ExecStart=/bin/sh -c "if [ -f /sys/bus/platform/devices/gpio-fsi/fsi0/rescan ]; then echo 1 > /sys/bus/platform/devices/gpio-fsi/fsi0/rescan; else echo 1 > /sys/bus/platform/devices/fsi-master/scan; fi"
 Type=oneshot
 RemainAfterExit=yes