diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service
index 036b789..d71cd47 100644
--- a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service
+++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service
@@ -5,3 +5,4 @@
 Type=oneshot
 RemainAfterExit=no
 ExecStart=/usr/sbin/firmware_update.sh /tmp/images/%I
+TimeoutSec=300
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
index fe776a5..ce59894 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Ampere set GPIOs before power off
-Requires=op-wait-power-off@%i.service
-After=op-wait-power-off@%i.service
+Before=op-wait-power-off@%i.service
 Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service
index 09aa588..e7131a1 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Ampere set GPIOs before power on
-Requires=op-wait-power-on@%i.service
 Before=op-wait-power-on@%i.service
+After=obmc-power-start-pre@%i.target
 Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]