diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/lamp-test-led-overrides.json b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/lamp-test-led-overrides.json
new file mode 100644
index 0000000..0cde229
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/lamp-test-led-overrides.json
@@ -0,0 +1,10 @@
+{
+    "forceLEDs":[
+        "virtual_enc_fault",
+        "virtual_enc_id"
+    ],
+    "skipLEDs":[
+        "virtual_enc_fault",
+        "virtual_enc_id"
+    ]
+}
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-create-virtual-leds@.service b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-create-virtual-leds@.service
new file mode 100644
index 0000000..41bd081
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-create-virtual-leds@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Create the virtual physical LEDs
+
+[Service]
+Restart=always
+ExecStart=/usr/sbin/phosphor-ledcontroller -p %f
+SyslogIdentifier=obmc-led-create-virtual-leds
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 174d9d0..a41f12a 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE_${PN}_append_rainier += "obmc-led-set-all-groups-asserted@.service"
+SYSTEMD_SERVICE_${PN}_append_rainier += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
 
 # Copies config file having arguments for led-set-all-groups-asserted.sh
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_rainier +="obmc/led/set-all/groups/config"
@@ -9,6 +9,9 @@
 # Also, enable Lamp Test feature for rainier systems
 PACKAGECONFIG_append_rainier = " use-json use-lamp-test"
 
+# Install the lamp test override file for rainier
+SRC_URI_append_rainier = " file://lamp-test-led-overrides.json"
+
 pkg_postinst_${PN}_rainier () {
 
     # Needed this to run as part of BMC boot
@@ -22,6 +25,18 @@
     LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/obmc-led-set-all-groups-asserted@false.service"
     TARGET="../obmc-led-set-all-groups-asserted@.service"
     ln -s $TARGET $LINK
+
+    # Needed this to run as part of BMC boot
+    mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
+    LINK_FAULT="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-create-virtual-leds@sys-class-leds-virtual-enc-fault.service"
+    TARGET_FAULT="../obmc-led-create-virtual-leds@.service"
+    ln -s $TARGET_FAULT $LINK_FAULT
+
+    # Needed this to run as part of BMC boot
+    mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
+    LINK_ID="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-create-virtual-leds@sys-class-leds-virtual-enc-id.service"
+    TARGET_ID="../obmc-led-create-virtual-leds@.service"
+    ln -s $TARGET_ID $LINK_ID
 }
 
 pkg_prerm_${PN}_rainier () {
@@ -31,4 +46,16 @@
 
     LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/obmc-led-set-all-groups-asserted@false.service"
     rm $LINK
+
+    LINK_FAULT="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-create-virtual-leds@sys-class-leds-virtual-enc-fault.service"
+    rm $LINK_FAULT
+
+    LINK_ID="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-create-virtual-leds@sys-class-leds-virtual-enc-id.service"
+    rm $LINK_ID
+}
+
+# Install lamp test override json
+do_install_append_rainier() {
+    install -d ${D}${datadir}/${BPN}/
+    install -m 0644 ${WORKDIR}/lamp-test-led-overrides.json ${D}${datadir}/${BPN}/
 }