diff --git a/meta-openpower/classes/openpower-software-manager-ubi.bbclass b/meta-openpower/classes/openpower-software-manager-ubi.bbclass
index 7ff62be..7167b88 100644
--- a/meta-openpower/classes/openpower-software-manager-ubi.bbclass
+++ b/meta-openpower/classes/openpower-software-manager-ubi.bbclass
@@ -7,7 +7,6 @@
         obmc-flash-bios-ubiumount-rw@.service \
         obmc-flash-bios-ubipatch.service \
         obmc-flash-bios-ubiremount.service \
-        obmc-flash-bios-updatesymlinks.service \
         obmc-flash-bios-cleanup.service \
         obmc-flash-bios-enable-clearvolatile@.service \
         obmc-flash-bios-check-clearvolatile@.service \
diff --git a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass
new file mode 100644
index 0000000..c83f4aa
--- /dev/null
+++ b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass
@@ -0,0 +1,5 @@
+PACKAGECONFIG_append = " virtual_pnor"
+
+SYSTEMD_SERVICE_${PN} += " \
+        obmc-vpnor-updatesymlinks.service \
+        "