diff --git a/data/boot_lists/All b/data/boot_lists/All
index b36bd36..567ca44 100755
--- a/data/boot_lists/All
+++ b/data/boot_lists/All
@@ -12,12 +12,20 @@
 IPMI Power Soft (mfg)
 Host Power Off
 Host Power Off (mfg)
-OBMC Reboot
-OBMC Reboot (mfg)
-PDU AC Cycle
-PDU AC Cycle (mfg)
-IPMI MC Reset Warm
-IPMI MC Reset Warm (mfg)
+APOR
+APOR (mfg)
+OBMC Reboot (run)
+OBMC Reboot (run) (mfg)
+OBMC Reboot (off)
+OBMC Reboot (off) (mfg)
+PDU AC Cycle (run)
+PDU AC Cycle (run) (mfg)
+PDU AC Cycle (off)
+PDU AC Cycle (off) (mfg)
+IPMI MC Reset Warm (run)
+IPMI MC Reset Warm (run) (mfg)
+IPMI MC Reset Warm (off)
+IPMI MC Reset Warm (off) (mfg)
 IPMI Power Cycle
 IPMI Power Cycle (mfg)
 IPMI Power Reset
diff --git a/data/boot_lists/Manufacturing b/data/boot_lists/Manufacturing
index bc50bf1..c3254c5 100755
--- a/data/boot_lists/Manufacturing
+++ b/data/boot_lists/Manufacturing
@@ -4,9 +4,13 @@
 IPMI Power Off (mfg)
 IPMI Power Soft (mfg)
 Host Power Off (mfg)
-OBMC Reboot (mfg)
-PDU AC Cycle (mfg)
-IPMI MC Reset Warm (mfg)
+APOR (mfg)
+OBMC Reboot (run) (mfg)
+OBMC Reboot (off) (mfg)
+PDU AC Cycle (run) (mfg)
+PDU AC Cycle (off) (mfg)
+IPMI MC Reset Warm (run) (mfg)
+IPMI MC Reset Warm (off) (mfg)
 IPMI Power Cycle (mfg)
 IPMI Power Reset (mfg)
 Auto Reboot (mfg)
diff --git a/data/boot_lists/OBMC_reboot b/data/boot_lists/OBMC_reboot
index f234706..9fef87e 100755
--- a/data/boot_lists/OBMC_reboot
+++ b/data/boot_lists/OBMC_reboot
@@ -1,4 +1,14 @@
-OBMC Reboot
-OBMC Reboot (mfg)
-PDU AC Cycle
-PDU AC Cycle (mfg)
+APOR
+APOR (mfg)
+OBMC Reboot (run)
+OBMC Reboot (run) (mfg)
+OBMC Reboot (off)
+OBMC Reboot (off) (mfg)
+PDU AC Cycle (run)
+PDU AC Cycle (run) (mfg)
+PDU AC Cycle (off)
+PDU AC Cycle (off) (mfg)
+IPMI MC Reset Warm (run)
+IPMI MC Reset Warm (run) (mfg)
+IPMI MC Reset Warm (off)
+IPMI MC Reset Warm (off) (mfg)