diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
index ada6d11..58e73b5 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
@@ -22,6 +22,7 @@
         phosphor-dbus-interfaces \
         phosphor-logging \
         sdbusplus \
+        virtual-obmc-image-manager \
         "
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
index 78955f7..6a6ba05 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -48,6 +48,11 @@
     phosphor-logging \
     phosphor-dbus-interfaces \
     sdbusplus \
+    virtual-obmc-image-manager \
+"
+
+RPROVIDES_${PN}-version += " \
+    virtual-obmc-image-manager \
 "
 
 FILES_${PN}-version += "${sbindir}/phosphor-version-software-manager"
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 035270e..2d2b7e1 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -85,7 +85,6 @@
 
 SUMMARY_${PN}-software = "Software applications"
 RDEPENDS_${PN}-software = " \
-        ${VIRTUAL-RUNTIME_obmc-bmc-code-mgr} \
         ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \
         ${VIRTUAL-RUNTIME_obmc-bmc-updater} \
         "
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 543413c..5a5fe3a 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -77,12 +77,6 @@
 # Linux kernel LED subsystem LEDs.
 VIRTUAL-RUNTIME_obmc-leds-sysfs ?= "phosphor-led-sysfs"
 
-# obmc-bmc-code-mgr
-#
-# Provides an implementation of the xyz.openbmc_project.Software.Version
-# interface.
-VIRTUAL-RUNTIME_obmc-bmc-code-mgr ?= "phosphor-software-manager-version"
-
 # obmc-bmc-download-mgr
 #
 # Provides an implementation of the xyz.openbmc_project.Common.TFTP