diff --git a/boards/librem13v2/librem13v2.config b/boards/librem13v2/librem13v2.config
index eca00583..e37d506b 100644
--- a/boards/librem13v2/librem13v2.config
+++ b/boards/librem13v2/librem13v2.config
@@ -30,7 +30,7 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
 export CONFIG_BOOT_KERNEL_REMOVE=""
-export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 13v2 Heads Boot Menu"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
diff --git a/boards/librem13v4/librem13v4.config b/boards/librem13v4/librem13v4.config
index 12fe0488..f78f13a9 100644
--- a/boards/librem13v4/librem13v4.config
+++ b/boards/librem13v4/librem13v4.config
@@ -30,7 +30,7 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
 export CONFIG_BOOT_KERNEL_REMOVE=""
-export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 13v2 Heads Boot Menu"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
diff --git a/boards/librem15v3/librem15v3.config b/boards/librem15v3/librem15v3.config
index 80c52295..f9d05253 100644
--- a/boards/librem15v3/librem15v3.config
+++ b/boards/librem15v3/librem15v3.config
@@ -32,7 +32,7 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
 export CONFIG_BOOT_KERNEL_REMOVE=""
-export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 15v3 Heads Boot Menu"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
diff --git a/boards/librem15v4/librem15v4.config b/boards/librem15v4/librem15v4.config
index 16f6aa44..5f79a91d 100644
--- a/boards/librem15v4/librem15v4.config
+++ b/boards/librem15v4/librem15v4.config
@@ -32,7 +32,7 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
 export CONFIG_BOOT_KERNEL_REMOVE=""
-export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 15v4 Heads Boot Menu"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
diff --git a/config/coreboot-librem13v2.config b/config/coreboot-librem13v2.config
index b56ba9d3..a27a2627 100644
--- a/config/coreboot-librem13v2.config
+++ b/config/coreboot-librem13v2.config
@@ -26,7 +26,5 @@ CONFIG_FSP_M_XIP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage"
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=on quiet loglevel=3"
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
 CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz"
-CONFIG_COREINFO_SECONDARY_PAYLOAD=y
-CONFIG_MEMTEST_SECONDARY_PAYLOAD=y
diff --git a/config/coreboot-librem13v4.config b/config/coreboot-librem13v4.config
index c2935736..79aacb18 100644
--- a/config/coreboot-librem13v4.config
+++ b/config/coreboot-librem13v4.config
@@ -26,7 +26,5 @@ CONFIG_FSP_M_XIP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem13v4/bzImage"
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=on quiet loglevel=3"
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
 CONFIG_LINUX_INITRD="../../build/librem13v4/initrd.cpio.xz"
-CONFIG_COREINFO_SECONDARY_PAYLOAD=y
-CONFIG_MEMTEST_SECONDARY_PAYLOAD=y
diff --git a/config/coreboot-librem15v3.config b/config/coreboot-librem15v3.config
index bf5a2bc1..c81c72df 100644
--- a/config/coreboot-librem15v3.config
+++ b/config/coreboot-librem15v3.config
@@ -26,7 +26,5 @@ CONFIG_FSP_M_XIP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem15v3/bzImage"
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=on quiet loglevel=3"
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
 CONFIG_LINUX_INITRD="../../build/librem15v3/initrd.cpio.xz"
-CONFIG_COREINFO_SECONDARY_PAYLOAD=y
-CONFIG_MEMTEST_SECONDARY_PAYLOAD=y
diff --git a/config/coreboot-librem15v4.config b/config/coreboot-librem15v4.config
index 541d558a..32a0742d 100644
--- a/config/coreboot-librem15v4.config
+++ b/config/coreboot-librem15v4.config
@@ -26,7 +26,5 @@ CONFIG_FSP_M_XIP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem15v4/bzImage"
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=on quiet loglevel=3"
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
 CONFIG_LINUX_INITRD="../../build/librem15v4/initrd.cpio.xz"
-CONFIG_COREINFO_SECONDARY_PAYLOAD=y
-CONFIG_MEMTEST_SECONDARY_PAYLOAD=y