diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.its b/board/microchip/mpfs_icicle/mpfs_icicle.its
index a62b079fa1..2f89a6ee2f 100644
--- a/board/microchip/mpfs_icicle/mpfs_icicle.its
+++ b/board/microchip/mpfs_icicle/mpfs_icicle.its
@@ -24,7 +24,7 @@
 					algo = "sha256";
 				};
 			};
-			base_fdt {
+			fdt-mpfs-icicle-kit.dtb {
 				description = "Flattened Device Tree blob";
 				data = /incbin/("./mpfs-icicle-kit.dtb");
 				type = "flat_dt";
@@ -35,19 +35,41 @@
 					algo = "sha256";
 				};
 			};
+			fdt-mpfs-icicle-kit-prod.dtb {
+				description = "Flattened Device Tree blob";
+				data = /incbin/("./mpfs-icicle-kit-prod.dtb");
+				type = "flat_dt";
+				arch = "riscv";
+				compression = "none";
+				load = <0x8a000000>;
+				hash-1 {
+					algo = "sha256";
+				};
+			};
 		};
 
 		configurations {
-			default = "kernel_dtb";
-			kernel_dtb {
+			default = "conf-microchip,mpfs-icicle-kit-prod";
+			conf-microchip,mpfs-icicle-kit {
 				description = "1 Linux kernel, FDT blob";
 				kernel = "kernel";
-				fdt = "base_fdt";
+				fdt = "fdt-mpfs-icicle-kit.dtb";
 			};
 
-			base_dtb {
+			conf-microchip,mpfs-icicle-kit-prod {
+				description = "1 Linux kernel, FDT blob";
+				kernel = "kernel";
+				fdt = "fdt-mpfs-icicle-kit-prod.dtb";
+			};
+
+			conf-microchip,fdt-mpfs-icicle-kit.dtb {
 				description = "Base FDT blob for MPFS Icicle board";
-				fdt = "base_fdt";
+				fdt = "fdt-mpfs-icicle-kit.dtb";
+			};
+
+			conf-microchip,fdt-mpfs-icicle-kit-prod.dtb {
+				description = "Base FDT blob for MPFS Icicle Production board";
+				fdt = "fdt-mpfs-icicle-kit-prod.dtb";
 			};
 		};
-};
+};
\ No newline at end of file
diff --git a/board/microchip/mpfs_icicle/uboot-env.txt b/board/microchip/mpfs_icicle/uboot-env.txt
index 8a655085ed..befbfa2006 100644
--- a/board/microchip/mpfs_icicle/uboot-env.txt
+++ b/board/microchip/mpfs_icicle/uboot-env.txt
@@ -5,12 +5,15 @@
 setenv fdt_high 0xffffffffffffffff
 setenv initrd_high 0xffffffffffffffff
 
-load mmc 0:${distro_bootpart} ${scriptaddr} mpfs_icicle.itb;
-bootm start ${scriptaddr}#kernel_dtb;
-bootm loados ${scriptaddr};
-# Try to load a ramdisk if available inside fitImage
-bootm ramdisk;
-bootm prep;
-fdt set /soc/ethernet@20112000 mac-address ${icicle_mac_addr0};
-fdt set /soc/ethernet@20110000 mac-address ${icicle_mac_addr1};
-bootm go;
+fdt addr ${fdtcontroladdr}
+fdt get value board_compatible / compatible 1
+
+setenv fitconf conf-${board_compatible}
+
+load mmc 0:${distro_bootpart} ${scriptaddr} mpfs_icicle.itb
+bootm start ${scriptaddr}#${fitconf}
+bootm loados ${scriptaddr}
+bootm ramdisk
+bootm prep
+run design_overlays
+bootm go
diff --git a/board/microchip/mpfs_icicle/uboot-fragment-rootfs.config b/board/microchip/mpfs_icicle/uboot-fragment-rootfs.config
index e2a5eb9438..47f4c35ea4 100644
--- a/board/microchip/mpfs_icicle/uboot-fragment-rootfs.config
+++ b/board/microchip/mpfs_icicle/uboot-fragment-rootfs.config
@@ -1,3 +1,4 @@
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/mmcblk0p3 rootwait uio_pdrv_genirq.of_id=generic-uio"
 CONFIG_MPFS_PRIORITISE_QSPI_BOOT=n
+CONFIG_OF_BOARD=y