diff --git a/carfield.mk b/carfield.mk
index a0dd2780..157f5bd1 100644
--- a/carfield.mk
+++ b/carfield.mk
@@ -44,7 +44,7 @@ include $(CAR_ROOT)/bender-safed.mk
 ######################
 
 CAR_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:carfield/carfield-nonfree.git
-CAR_NONFREE_COMMIT ?= 5a024891
+CAR_NONFREE_COMMIT ?= f8bf7942
 
 ## @section Carfield platform nonfree components
 ## Clone the non-free verification IP for Carfield. Some components such as CI scripts and ASIC
diff --git a/sw/boot/remote_boot.dtsi b/sw/boot/remote_boot.dtsi
index dde661ea..67ab6bc2 100644
--- a/sw/boot/remote_boot.dtsi
+++ b/sw/boot/remote_boot.dtsi
@@ -1,2 +1,2 @@
 // Uncomment below for remote boot
-// remote-boot = "0.0.0.0:vcu128-01/carfield/uImage-ci";
\ No newline at end of file
+// remote-boot = "0.0.0.0:vcu128-01/carfield/uImage-ci";
diff --git a/target/xilinx/scripts/flash_spi.tcl b/target/xilinx/scripts/flash_spi.tcl
index c5e7f470..4bd83052 100644
--- a/target/xilinx/scripts/flash_spi.tcl
+++ b/target/xilinx/scripts/flash_spi.tcl
@@ -13,27 +13,34 @@ open_hw_target $::env(XILINX_HOST):$::env(XILINX_PORT)/$::env(XILINX_FPGA_PATH)
 set file $::env(FILE)
 set offset $::env(OFFSET)
 set mcs_file image.mcs
+set mcs_files_x8 [list image_primary.mcs image_secondary.mcs]
 
 if {$::env(XILINX_BOARD) eq "vcu118"} {
   set hw_device [get_hw_devices xcvu9p_0]
-  set hw_mem_device [lindex [get_cfgmem_parts {mt25qu01g-spi-x1_x2_x4}] 0]
+  set hw_mem_device [lindex [get_cfgmem_parts {mt25qu01g-spi-x1_x2_x4_x8}] 0]
+  write_cfgmem -force -format mcs -size 256 -interface SPIx8 \
+    -loaddata "up $offset $file" \
+    -checksum \
+    -file $mcs_file
+  # Two files are generated for spix8
+  set $mcs_file $mcs_files_x8
 }
 
 if {$::env(XILINX_BOARD) eq "vcu128"} {
   set hw_device [get_hw_devices xcvu37p_0]
   set hw_mem_device [lindex [get_cfgmem_parts {mt25qu02g-spi-x1_x2_x4}] 0]
+  write_cfgmem -force -format mcs -size 256 -interface SPIx4 \
+    -loaddata "up $offset $file" \
+    -checksum \
+    -file $mcs_file
 }
 
-write_cfgmem -force -format mcs -size 256 -interface SPIx4 \
--loaddata "up $offset $file" \
--checksum \
--file $mcs_file
 
 set_property PARAM.FREQUENCY 15000000 [get_hw_targets *]
 
 create_hw_cfgmem -hw_device $hw_device $hw_mem_device
 set hw_cfgmem [get_property PROGRAM.HW_CFGMEM $hw_device]
-set_property PROGRAM.FILES [list $mcs_file ] $hw_cfgmem
+set_property PROGRAM.FILES $mcs_file $hw_cfgmem
 set_property PROGRAM.ADDRESS_RANGE  {use_file} $hw_cfgmem
 set_property PROGRAM.PRM_FILE {} $hw_cfgmem
 set_property PROGRAM.UNUSED_PIN_TERMINATION {pull-none} $hw_cfgmem