diff --git a/data/boot_lists/All b/data/boot_lists/All
index 3bc25c4..b36bd36 100755
--- a/data/boot_lists/All
+++ b/data/boot_lists/All
@@ -2,13 +2,27 @@
 Out of Band Code Update
 REST Power On
 REST Power On (mfg)
-Host Reboot
-Host Reboot (mfg)
-Auto Reboot
-Auto Reboot (mfg)
+IPMI Power On
+IPMI Power On (mfg)
 REST Power Off
 REST Power Off (mfg)
+IPMI Power Off
+IPMI Power Off (mfg)
+IPMI Power Soft
+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)
+IPMI Power Cycle
+IPMI Power Cycle (mfg)
+IPMI Power Reset
+IPMI Power Reset (mfg)
+Auto Reboot
+Auto Reboot (mfg)
+Host Reboot
+Host Reboot (mfg)
diff --git a/data/boot_lists/Manufacturing b/data/boot_lists/Manufacturing
index de522ae..bc50bf1 100755
--- a/data/boot_lists/Manufacturing
+++ b/data/boot_lists/Manufacturing
@@ -1,6 +1,13 @@
 REST Power On (mfg)
+IPMI Power On (mfg)
 REST Power Off (mfg)
-OBMC Reboot (mfg)
-Host Reboot (mfg)
+IPMI Power Off (mfg)
+IPMI Power Soft (mfg)
 Host Power Off (mfg)
+OBMC Reboot (mfg)
+PDU AC Cycle (mfg)
+IPMI MC Reset Warm (mfg)
+IPMI Power Cycle (mfg)
+IPMI Power Reset (mfg)
 Auto Reboot (mfg)
+Host Reboot (mfg)
diff --git a/data/boot_lists/OBMC_reboot b/data/boot_lists/OBMC_reboot
new file mode 100755
index 0000000..f234706
--- /dev/null
+++ b/data/boot_lists/OBMC_reboot
@@ -0,0 +1,4 @@
+OBMC Reboot
+OBMC Reboot (mfg)
+PDU AC Cycle
+PDU AC Cycle (mfg)
diff --git a/data/boot_lists/OS_reboot b/data/boot_lists/OS_reboot
new file mode 100755
index 0000000..6a531d8
--- /dev/null
+++ b/data/boot_lists/OS_reboot
@@ -0,0 +1,10 @@
+IPMI MC Reset Warm
+IPMI MC Reset Warm (mfg)
+IPMI Power Cycle
+IPMI Power Cycle (mfg)
+IPMI Power Reset
+IPMI Power Reset (mfg)
+Auto Reboot
+Auto Reboot (mfg)
+Host Reboot
+Host Reboot (mfg)
diff --git a/data/boot_lists/Power_cycle b/data/boot_lists/Power_cycle
deleted file mode 100755
index 9046f11..0000000
--- a/data/boot_lists/Power_cycle
+++ /dev/null
@@ -1,6 +0,0 @@
-BMC Host Reboot
-BMC Host Reboot (mfg)
-BMC Power Reset
-BMC Power Reset (mfg)
-BMC Power Cycle
-BMC Power Cycle (mfg)
diff --git a/data/boot_lists/Power_off b/data/boot_lists/Power_off
index e5f9193..268b8da 100755
--- a/data/boot_lists/Power_off
+++ b/data/boot_lists/Power_off
@@ -1,2 +1,8 @@
 REST Power Off
+REST Power Off (mfg)
+IPMI Power Off
+IPMI Power Off (mfg)
+IPMI Power Soft
+IPMI Power Soft (mfg)
 Host Power Off
+Host Power Off (mfg)
diff --git a/data/boot_lists/Power_on b/data/boot_lists/Power_on
index ab99f2e..ff4a0e6 100755
--- a/data/boot_lists/Power_on
+++ b/data/boot_lists/Power_on
@@ -1 +1,4 @@
 REST Power On
+REST Power On (mfg)
+IPMI Power On
+IPMI Power On (mfg)