diff --git a/projects/ad9081_fmca_ebz/vck190/system_top.v b/projects/ad9081_fmca_ebz/vck190/system_top.v
index 7ca5fae560..a29cf245d7 100644
--- a/projects/ad9081_fmca_ebz/vck190/system_top.v
+++ b/projects/ad9081_fmca_ebz/vck190/system_top.v
@@ -281,11 +281,11 @@ module system_top  #(
     .ddr4_dimm1_dqs_t (ddr4_dqs_t),
     .ddr4_dimm1_odt (ddr4_odt),
     .ddr4_dimm1_reset_n (ddr4_reset_n),
-    .spi0_csn (spi0_csn),
+    .spi0_csn  (spi0_csn),
     .spi0_miso (spi0_miso),
     .spi0_mosi (spi0_mosi),
     .spi0_sclk (spi0_sclk),
-    .spi1_csn (spi1_csn),
+    .spi1_csn  (spi1_csn),
     .spi1_miso (spi1_miso),
     .spi1_mosi (spi1_mosi),
     .spi1_sclk (spi1_sclk),
diff --git a/projects/common/vck190/system_project.tcl b/projects/common/vck190/system_project.tcl
index 05db7dcfc6..9b8c34f4a3 100755
--- a/projects/common/vck190/system_project.tcl
+++ b/projects/common/vck190/system_project.tcl
@@ -11,7 +11,6 @@ adi_project template_vck190
 adi_project_files template_vck190 [list \
   "$ad_hdl_dir/library/common/ad_iobuf.v" \
   "$ad_hdl_dir/projects/common/vck190/vck190_system_constr.xdc" \
-  "system_constr.xdc" \
   "system_top.v" ]
 
 adi_project_run template_vck190
diff --git a/projects/common/vck190/system_top.v b/projects/common/vck190/system_top.v
index 3a7b3eaa61..5bd72e72b5 100755
--- a/projects/common/vck190/system_top.v
+++ b/projects/common/vck190/system_top.v
@@ -105,11 +105,11 @@ module system_top (
     .ddr4_dimm1_odt (ddr4_odt),
     .ddr4_dimm1_reset_n (ddr4_reset_n),
 
-    .spi0_csn (1'b1),
+    .spi0_csn (),
     .spi0_miso (1'b0),
     .spi0_mosi (),
     .spi0_sclk (),
-    .spi1_csn (1'b1),
+    .spi1_csn (),
     .spi1_miso (1'b0),
     .spi1_mosi (),
     .spi1_sclk ());
diff --git a/projects/common/vmk180/system_top.v b/projects/common/vmk180/system_top.v
index 3a7b3eaa61..5bd72e72b5 100755
--- a/projects/common/vmk180/system_top.v
+++ b/projects/common/vmk180/system_top.v
@@ -105,11 +105,11 @@ module system_top (
     .ddr4_dimm1_odt (ddr4_odt),
     .ddr4_dimm1_reset_n (ddr4_reset_n),
 
-    .spi0_csn (1'b1),
+    .spi0_csn (),
     .spi0_miso (1'b0),
     .spi0_mosi (),
     .spi0_sclk (),
-    .spi1_csn (1'b1),
+    .spi1_csn (),
     .spi1_miso (1'b0),
     .spi1_mosi (),
     .spi1_sclk ());
diff --git a/projects/common/vmk180/vmk180_system_bd.tcl b/projects/common/vmk180/vmk180_system_bd.tcl
index 2566b577bd..dbca280019 100644
--- a/projects/common/vmk180/vmk180_system_bd.tcl
+++ b/projects/common/vmk180/vmk180_system_bd.tcl
@@ -166,23 +166,35 @@ set sys_cpu_resetn        [get_bd_nets sys_cpu_resetn]
 set sys_dma_reset         [get_bd_nets sys_350m_reset]
 set sys_dma_resetn        [get_bd_nets sys_350m_resetn]
 
-# spi
+#
+
+ad_ip_instance xlconcat spi0_csn_sources
+ad_ip_parameter spi0_csn_sources config.num_ports {3}
+ad_connect spi0_csn_sources/dout spi0_csn
 
 ad_connect  sys_cips/spi0_sck_o spi0_sclk
 ad_connect  sys_cips/spi0_sck_i GND
 ad_connect  sys_cips/spi0_io0_o spi0_mosi
 ad_connect  sys_cips/spi0_io0_i spi0_miso
 ad_connect  sys_cips/spi0_io1_i GND
-ad_connect  sys_cips/spi0_ss_o spi0_csn
-ad_connect  sys_cips/spi0_ss_i VCC
+ad_connect  sys_cips/spi0_ss_o  spi0_csn_sources/in0
+ad_connect  sys_cips/spi0_ss1_o spi0_csn_sources/in1
+ad_connect  sys_cips/spi0_ss2_o spi0_csn_sources/in2
+ad_connect  sys_cips/spi0_ss_i  VCC
+
+ad_ip_instance xlconcat spi1_csn_sources
+ad_ip_parameter spi1_csn_sources config.num_ports {3}
+ad_connect spi1_csn_sources/dout spi1_csn
 
 ad_connect  sys_cips/spi1_sck_o spi1_sclk
 ad_connect  sys_cips/spi1_sck_i GND
 ad_connect  sys_cips/spi1_io0_o spi1_mosi
 ad_connect  sys_cips/spi1_io0_i spi1_miso
 ad_connect  sys_cips/spi1_io1_i GND
-ad_connect  sys_cips/spi1_ss_o spi1_csn
-ad_connect  sys_cips/spi1_ss_i VCC
+ad_connect  sys_cips/spi1_ss_o  spi1_csn_sources/in0
+ad_connect  sys_cips/spi1_ss1_o spi1_csn_sources/in1
+ad_connect  sys_cips/spi1_ss2_o spi1_csn_sources/in2
+ad_connect  sys_cips/spi1_ss_i  VCC
 
 # system id