diff --git a/src/soc/qualcomm/x1p42100/Makefile.mk b/src/soc/qualcomm/x1p42100/Makefile.mk
index cfb8410e60..2fdade4c6a 100644
--- a/src/soc/qualcomm/x1p42100/Makefile.mk
+++ b/src/soc/qualcomm/x1p42100/Makefile.mk
@@ -222,11 +222,20 @@ cbfs-files-y += $(AOP_DEVCFG_META_CBFS)
 
 ################################################################################
 CPUCP_FILE := $(X1P42100_BLOB)/cpucp/cpucp.elf
-CPUCP_CBFS := $(CONFIG_CBFS_PREFIX)/cpucp
-$(CPUCP_CBFS)-file := $(CPUCP_FILE)
-$(CPUCP_CBFS)-type := payload
-$(CPUCP_CBFS)-compression := none
-cbfs-files-y += $(CPUCP_CBFS)
+
+CPUCP_CBFS_RW := $(CONFIG_CBFS_PREFIX)/cpucp_rw
+regions-for-file-$(CPUCP_CBFS_RW) = FW_MAIN_A,FW_MAIN_B
+$(CPUCP_CBFS_RW)-file := $(CPUCP_FILE)
+$(CPUCP_CBFS_RW)-type := payload
+$(CPUCP_CBFS_RW)-compression := none
+cbfs-files-y += $(CPUCP_CBFS_RW)
+
+CPUCP_CBFS_RO := $(CONFIG_CBFS_PREFIX)/cpucp_ro
+regions-for-file-$(CPUCP_CBFS_RO) = COREBOOT
+$(CPUCP_CBFS_RO)-file := $(CPUCP_FILE)
+$(CPUCP_CBFS_RO)-type := payload
+$(CPUCP_CBFS_RO)-compression := $(CBFS_COMPRESS_FLAG)
+cbfs-files-y += $(CPUCP_CBFS_RO)
 
 ################################################################################
 # Rule to create cpucp_meta from cpucp.elf
diff --git a/src/soc/qualcomm/x1p42100/cpucp_load_reset.c b/src/soc/qualcomm/x1p42100/cpucp_load_reset.c
index 274c724724..80e3a39283 100644
--- a/src/soc/qualcomm/x1p42100/cpucp_load_reset.c
+++ b/src/soc/qualcomm/x1p42100/cpucp_load_reset.c
@@ -6,6 +6,7 @@
 #include <program_loading.h>
 #include <soc/cpucp.h>
 #include <device/mmio.h>
+#include <security/vboot/vboot_common.h>
 #include <soc/addressmap.h>
 #include <soc/mmu_common.h>
 #include <soc/symbols_common.h>
@@ -24,8 +25,11 @@ void cpucp_fw_load_reset(void)
 
 	printk(BIOS_DEBUG, "SOC image: CPUCP DTBS image loaded successfully.\n");
 
-	struct prog cpucp_fw_prog =
-		PROG_INIT(PROG_PAYLOAD, CONFIG_CBFS_PREFIX "/cpucp");
+	const char *cpucp_name = (CONFIG(VBOOT) && !vboot_recovery_mode_enabled())
+			 ? CONFIG_CBFS_PREFIX "/cpucp_rw"
+			 : CONFIG_CBFS_PREFIX "/cpucp_ro";
+
+	struct prog cpucp_fw_prog = PROG_INIT(PROG_PAYLOAD, cpucp_name);
 
 	if (!selfload(&cpucp_fw_prog))
 		die("SOC image: CPUCP load failed");