diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index c452225..4be7585 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -140,8 +140,8 @@
 }
 
 ubi_setenv() {
-    varName="${variable%"\x3d"*}"
-    value="${variable##*"\x3d"}"
+    varName="${variable%=*}"
+    value="${variable##*=}"
     fw_setenv "$varName" "$value"
 }
 
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
index c26273f..73b55d4 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
@@ -4,5 +4,5 @@
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc ubisetenv %i
+ExecStart=/usr/bin/env obmc-flash-bmc ubisetenv %I
 SyslogIdentifier=obmc-flash-bmc