diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb
index 16fde56..645847b 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb
@@ -5,8 +5,8 @@
 
 inherit obmc-phosphor-systemd
 
-DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
+DEPENDS += "phosphor-gpio-monitor"
+RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor"
 RDEPENDS:${PN} += "bash"
 
 AMPERE_MONITOR_INSTANCES = " \
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 284f353..032cdaf 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -5,7 +5,7 @@
     "
 
 # host watchdog does not support on bletchley
-RDEPENDS:${PN}:remove:bletchley = "virtual/obmc-watchdog"
+RDEPENDS:${PN}:remove:bletchley = "phosphor-watchdog"
 
 # bletchley doesn't have IPMI support, skip xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
 SOFT_SVC = ""
diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 77fcbe0..0270d87 100644
--- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,3 +1,3 @@
 # Neither of these are used in a gbmc configuration
 RDEPENDS:${PN}:remove:gbmc = "clear-once"
-RDEPENDS:${PN}:remove:gbmc = "${VIRTUAL-RUNTIME_obmc-bmc-updater}"
+RDEPENDS:${PN}:remove:gbmc = "phosphor-software-manager-updater"
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb
index a7bebeb..e9535ae 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb
+++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb
@@ -5,8 +5,8 @@
 
 inherit obmc-phosphor-systemd
 
-DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
+DEPENDS += "phosphor-gpio-monitor"
+RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor"
 
 S = "${WORKDIR}"
 SRC_URI += "file://toggle_identify_led.sh"
diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
index 8f99b24..3e5f87a 100644
--- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
+++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
@@ -5,7 +5,7 @@
 
 inherit obmc-phosphor-systemd
 
-RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor"
 RDEPENDS:${PN} += "busybox"
 
 RESET_SERVICE = "reset-fan-watchdog.service"
diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb
index 3e53f9d..5e83fab 100644
--- a/meta-ibm/recipes-phosphor/gpio/id-button.bb
+++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb
@@ -5,8 +5,8 @@
 
 inherit obmc-phosphor-systemd
 
-DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
+DEPENDS += "phosphor-gpio-monitor"
+RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor"
 
 S = "${WORKDIR}"
 SRC_URI += "file://toggle_identify_led.sh"
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 8805321..64d1cf2 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -3,7 +3,7 @@
 DEPENDS:append:p10bmc = " p10bmc-yaml-config"
 
 # host watchdog does not work with witherspoon-tacoma host firmware
-RDEPENDS:${PN}:remove:witherspoon-tacoma = "virtual/obmc-watchdog"
+RDEPENDS:${PN}:remove:witherspoon-tacoma = "phosphor-watchdog"
 
 EXTRA_OEMESON:ibm-ac-server = " \
     -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 51c5f40..56ee393 100644
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -24,9 +24,9 @@
     python3-sbe-log-parsers \
 "
 
-RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
-RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence"
-RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type"
+RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type phosphor-gpio-monitor-presence"
+RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control phosphor-gpio-monitor-presence"
+RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control phosphor-gpio-monitor-presence id-button phosphor-cooling-type"
 RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog"
 RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor"
 RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync"
diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb
index 74bb9a0..86166a2 100644
--- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb
+++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb
@@ -6,7 +6,7 @@
 
 inherit obmc-phosphor-systemd
 
-RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor"
 
 SYNC_SERVICE = "power-supply-sync.service"
 TGTFMT = "obmc-chassis-poweron@0.target"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index b6c2a0a..8a7b068 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,3 +1,3 @@
 # Support OCC pass through and general occ control
 # Support for GPIO presence service
-RDEPENDS:${PN}-inventory:append:zaius = " openpower-occ-control virtual/obmc-gpio-presence"
+RDEPENDS:${PN}-inventory:append:zaius = " openpower-occ-control phosphor-gpio-monitor-presence"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index f5c09cd..8a1ba19 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -9,7 +9,7 @@
                                              openpower-fru-vpd \
                                              openpower-occ-control \
                                              phosphor-cooling-type \
-                                             virtual/obmc-gpio-presence \
+                                             phosphor-gpio-monitor-presence \
                                             "
 
 RDEPENDS:${PN}-extras:append:fp5280g2 = " \
diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc
index 623cd79..4374a8c 100644
--- a/meta-intel-openbmc/conf/machine/include/intel.inc
+++ b/meta-intel-openbmc/conf/machine/include/intel.inc
@@ -18,6 +18,5 @@
 PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host"
 PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
-#PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor"
 
 OVERRIDES .= ":intel"
diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc
index 9a9e9f5..9b6206c 100644
--- a/meta-inventec/conf/machine/include/inventec.inc
+++ b/meta-inventec/conf/machine/include/inventec.inc
@@ -21,6 +21,5 @@
 PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host"
 PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
-PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor"
 
 OVERRIDES .= ":inventec"
diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb
index 9b1b1c4..310f71e 100644
--- a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb
+++ b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb
@@ -6,8 +6,8 @@
 inherit obmc-phosphor-systemd
 inherit allarch
 
-DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
+DEPENDS += "phosphor-gpio-monitor"
+RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor"
 
 # For now, monitoring checkstop is the only usecase
 OBMC_HOST_MONITOR_INSTANCES = "checkstop"
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 54d0649..a49eb7c 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -49,65 +49,18 @@
 # interface.
 VIRTUAL-RUNTIME_obmc-inventory-manager ?= "phosphor-inventory-manager"
 
-# obmc-led-manager
-#
-# Provides an implementation of the xyz.openbmc_project.ledmanager interface.
-VIRTUAL-RUNTIME_obmc-leds-manager ?= "phosphor-led-manager"
-
-# obmc-led-monitor
-#
-# Provides an implementation of the FRU fault monitor.
-VIRTUAL-RUNTIME_obmc-led-monitor ?= "phosphor-led-manager-faultmonitor"
-
-# obmc-led-sysfs
-#
-# Provides an implementation of xyz.openbmc_project.Led.Physical for
-# Linux kernel LED subsystem LEDs.
-VIRTUAL-RUNTIME_obmc-leds-sysfs ?= "phosphor-led-sysfs"
-
-# obmc-bmc-download-mgr
-#
-# Provides an implementation of the xyz.openbmc_project.Common.TFTP
-# interface.
-VIRTUAL-RUNTIME_obmc-bmc-download-mgr ?= "phosphor-software-manager-download-mgr"
-
-# obmc-bmc-version
-#
-# Provides an implementation of the xyz.openbmc_project.Software.Version
-# interface.
-VIRTUAL-RUNTIME_obmc-bmc-version ?= "phosphor-software-manager-version"
-
-# obmc-bmc-updater
-#
-# Provides an implementation of the xyz.openbmc_project.Software.Activation
-# interface.
-VIRTUAL-RUNTIME_obmc-bmc-updater ?= "phosphor-software-manager-updater"
-
 # obmc-sensors-hwmon
 #
 # Provides an implementation of xyz.openbmc_project.Sensor.Value
 # for hwmon sensors.
 VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "phosphor-hwmon"
 
-# obmc-dump-manager
-# Provide support for managing dump
-VIRTUAL-RUNTIME_obmc-dump-manager ?= "phosphor-debug-collector-manager"
-
-# obmc-dump-monitor
-# Provide support for monitoring BMC core dumps
-VIRTUAL-RUNTIME_obmc-dump-monitor ?= "phosphor-debug-collector-monitor"
-
 # phosphor-hwmon-config
 #
 # The phosphor-hwmon package can have its configuration generated
 # automatically if the MRW feature is enabled.
 VIRTUAL-RUNTIME_phosphor-hwmon-config ?= ""
 
-# obmc-network-manager
-#
-# Provide support for managing network
-VIRTUAL-RUNTIME_obmc-network-manager ?= "phosphor-network"
-
 # Configuration overrides for phosphor-ipmi-fru.
 #
 # The phosphor-ipmi-fru application is data-driven and requires an input
@@ -190,25 +143,6 @@
 PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config ?= \
     "phosphor-fan-control-fan-config"
 
-# The phosphor-gpio-monitor application is data-driven and requires an input.
-# The application then watches the passed in input event entry for the
-# change in polarity for the value matching user input. Once the required
-# condition is met, it calls into a systemd target file if one is mentioned
-# in input.
-PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor"
-
-# The phosphor-watchdog application is data-driven and requires an input.
-# The application then starts a timer in disabled state. User of this timer
-# needs to first enable and then use it. This also provides a way for changing
-# the timeout if needed.
-PREFERRED_PROVIDER_virtual/obmc-watchdog ?= "phosphor-watchdog"
-
-# obmc-user-mgmt
-#
-# Provides an implementation of xyz.openbmc_project.User.Manager catering
-# to user management
-VIRTUAL-RUNTIME_obmc-user-mgmt ?= "phosphor-user-manager"
-
 OBMC_DBUS_PATH_ROOT ?= "/xyz/openbmc_project"
 OBMC_DBUS_IFACE_ROOT ?= "xyz.openbmc_project"
 
diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
index 4692bd1..aad36e5 100644
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -12,8 +12,6 @@
 DEPENDS += "libgpiod"
 DEPENDS += "cli11"
 DEPENDS += "nlohmann-json"
-PROVIDES += "virtual/obmc-gpio-monitor"
-PROVIDES += "virtual/obmc-gpio-presence"
 SRCREV = "629f3e3cd414294ee73bb3946e336f485fe8b504"
 PV = "1.0+git${SRCPV}"
 PR = "r1"
@@ -31,9 +29,6 @@
 
 EXTRA_OEMESON:append = " -Dtests=disabled"
 
-RPROVIDES:${PN}-monitor += "virtual/obmc-gpio-monitor"
-RPROVIDES:${PN}-presence += "virtual/obmc-gpio-presence"
-
 FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor"
 FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor"
 FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index 6794a09..ac0a09d 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -59,10 +59,10 @@
 RDEPENDS:${PN} += "phosphor-network"
 RDEPENDS:${PN} += "phosphor-time-manager"
 RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_ipmi-config}"
-RDEPENDS:${PN} += "virtual/obmc-watchdog"
+RDEPENDS:${PN} += "phosphor-watchdog"
 RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-state-manager}"
-RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-version}"
-RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-updater}"
+RDEPENDS:${PN} += "phosphor-software-manager-version"
+RDEPENDS:${PN} += "phosphor-software-manager-updater"
 
 inherit useradd
 
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 648cab3..5ba261b 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -116,9 +116,9 @@
 
 SUMMARY:${PN}-leds = "LED applications"
 RDEPENDS:${PN}-leds = " \
-        ${VIRTUAL-RUNTIME_obmc-leds-manager} \
-        ${VIRTUAL-RUNTIME_obmc-leds-sysfs} \
-        ${VIRTUAL-RUNTIME_obmc-led-monitor} \
+        phosphor-led-manager \
+        phosphor-led-sysfs \
+        phosphor-led-manager-faultmonitor \
         "
 
 SUMMARY:${PN}-logging = "Logging applications"
@@ -154,16 +154,16 @@
 
 SUMMARY:${PN}-software = "Software applications"
 RDEPENDS:${PN}-software = " \
-        ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \
-        ${VIRTUAL-RUNTIME_obmc-bmc-updater} \
-        ${VIRTUAL-RUNTIME_obmc-bmc-version} \
+        phosphor-software-manager-download-mgr \
+        phosphor-software-manager-updater \
+        phosphor-software-manager-version \
         ${${PN}-software-extras} \
         "
 
 SUMMARY:${PN}-debug-collector = "BMC debug collector"
 RDEPENDS:${PN}-debug-collector = " \
-        ${VIRTUAL-RUNTIME_obmc-dump-manager} \
-        ${VIRTUAL-RUNTIME_obmc-dump-monitor} \
+        phosphor-debug-collector-manager \
+        phosphor-debug-collector-monitor \
         phosphor-debug-collector-dreport \
         phosphor-debug-collector-scripts \
         "
@@ -175,7 +175,7 @@
 
 SUMMARY:${PN}-network = "BMC Network Manager"
 RDEPENDS:${PN}-network = " \
-        ${VIRTUAL-RUNTIME_obmc-network-manager} \
+        phosphor-network \
         "
 
 SUMMARY:${PN}-telemetry = "Telemetry solution"
@@ -185,7 +185,7 @@
 
 SUMMARY:${PN}-user-mgmt = "User management applications"
 RDEPENDS:${PN}-user-mgmt = " \
-        ${VIRTUAL-RUNTIME_obmc-user-mgmt} \
+        phosphor-user-manager \
         "
 RRECOMMENDS:${PN}-user-mgmt = " \
         pam-plugin-access \
diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
index 7331bdb..f0508fb 100644
--- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
@@ -9,9 +9,6 @@
 inherit meson pkgconfig
 inherit obmc-phosphor-dbus-service
 
-RPROVIDES:${PN} += "virtual/obmc-watchdog"
-PROVIDES += "virtual/obmc-watchdog"
-
 DEPENDS += "cli11"
 DEPENDS += "sdbusplus"
 DEPENDS += "sdeventplus"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 5053901..533e73f 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -19,7 +19,7 @@
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-ipmi-blobs-binarystore"
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-virtual-sensor"
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " acpi-power-state-daemon"
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual/obmc-gpio-presence"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-gpio-monitor-presence"
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ipmitool"
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-health-monitor"
 
@@ -31,9 +31,9 @@
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-certificate-manager"
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-user-manager"
 # Required for LEDs. Part of obmc-leds
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-led-manager"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-led-sysfs"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-led-manager-faultmonitor"
 # Required for the front port. Part of obmc-console
 OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " obmc-console"
 # Required from packagegroup-gbs-apps
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 6559296..af1dde1 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -9,6 +9,6 @@
 OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-hwmon"
 OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-inventory-manager"
 OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-host-postd"
-OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-manager}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-led-monitor}"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-led-manager"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-led-sysfs"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-led-manager-faultmonitor"