diff --git a/mmc/obmc-flash-bios b/mmc/obmc-flash-bios
index a9d4e39..61ac817 100644
--- a/mmc/obmc-flash-bios
+++ b/mmc/obmc-flash-bios
@@ -72,9 +72,6 @@
     mkdir -p ${alternate_dir}
   fi
   mount ${base_dir}/hostfw-${alternate_label} ${alternate_dir} -o ro
-
-  # setup host firmware runtime well known names
-  openpower-update-manager process-host-firmware
 }
 
 mmc_patch() {
diff --git a/mmc/openpower-process-host-firmware.service b/mmc/openpower-process-host-firmware.service
new file mode 100644
index 0000000..a9e419f
--- /dev/null
+++ b/mmc/openpower-process-host-firmware.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Set POWER host firmware well-known names
+After=org.open_power.Software.Host.Updater.service
+After=obmc-flash-bios-init.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/openpower-update-manager process-host-firmware
+
+[Install]
+WantedBy=org.open_power.Software.Host.Updater.service