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"