diff --git a/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service b/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service
index f52cac6..b668345 100644
--- a/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service
+++ b/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service
@@ -5,7 +5,7 @@
 
 [Service]
 Type=oneshot
-RemainAfterExit=no
+RemainAfterExit=yes
 ExecStart=/usr/bin/env obmc-flash-bios ubiremount
 SyslogIdentifier=obmc-flash-bios
 
diff --git a/recipes-phosphor/flash/openpower-software-manager/op-pnor-msl.service b/recipes-phosphor/flash/openpower-software-manager/op-pnor-msl.service
index dfd9e3c..92c599e 100644
--- a/recipes-phosphor/flash/openpower-software-manager/op-pnor-msl.service
+++ b/recipes-phosphor/flash/openpower-software-manager/op-pnor-msl.service
@@ -6,6 +6,7 @@
 Type=oneshot
 ExecStart=/usr/bin/env openpower-pnor-msl
 SyslogIdentifier=openpower-pnor-msl
+RemainAfterExit=yes
 
 [Install]
 WantedBy=obmc-flash-bios-updatesymlinks.service