diff --git a/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service b/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
index 5b353cc..11c8563 100644
--- a/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
+++ b/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 || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/unbind"
+ExecStart=/bin/sh -c "echo 1 > /sys/devices/platform/gpio-fsi/external_mode"
 Type=oneshot
 RemainAfterExit=yes
diff --git a/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service b/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
index 3dd068e..2cf65a3 100644
--- a/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
+++ b/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
@@ -1,11 +1,8 @@
 [Unit]
 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 || 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"
+ExecStart=/bin/sh -c "echo 0 > /sys/devices/platform/gpio-fsi/external_mode"
 Type=oneshot
 RemainAfterExit=yes