diff --git a/common/recipes-phosphor/flash/phosphor-software-manager.bb b/common/recipes-phosphor/flash/phosphor-software-manager.bb
index d4b4b4a..b54bd50 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -74,6 +74,7 @@
     obmc-flash-bmc-ubiro-remove@.service \
     usr-local.mount \
     obmc-flash-bmc-ubiremount.service \
+    obmc-flash-bmc-updateubootvars@.service \
     "
 
 # Name of the mtd device where the ubi volumes should be created
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index ddc0491..6725eaa 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -327,10 +327,10 @@
   ubiremount)
     remount_ubi
     ;;
-  preupdate)
+  createenvbackup)
     backup_env_vars
     ;;
-  postupdate)
+  updateubootvars)
     version="$2"
     update_env_vars
     ;;
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
index 3606a10..c1fc709 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
@@ -5,9 +5,9 @@
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStartPre=/usr/bin/env obmc-flash-bmc preupdate
+ExecStartPre=/usr/bin/env obmc-flash-bmc createenvbackup
 ExecStart=/usr/bin/env obmc-flash-bmc ubiro {RO_MTD} rofs-%i %i
 ExecStart=/usr/bin/env obmc-flash-bmc ubikernel {KERNEL_MTD} kernel-%i %i
 ExecStart=/usr/bin/env obmc-flash-bmc mtduboot u-boot %i
-ExecStartPost=/usr/bin/env obmc-flash-bmc postupdate %i
+ExecStartPost=/usr/bin/env obmc-flash-bmc updateubootvars %i
 SyslogIdentifier=obmc-flash-bmc
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
new file mode 100644
index 0000000..bab0b02
--- /dev/null
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description= Updates the u-boot variable to point BMC version to %I
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=/usr/bin/env obmc-flash-bmc updateubootvars %i
+SyslogIdentifier=obmc-flash-bmc