diff --git a/projects/adrv9371x/a10gx/system_qsys.tcl b/projects/adrv9371x/a10gx/system_qsys.tcl
index 755fe771c..7bf3e3032 100644
--- a/projects/adrv9371x/a10gx/system_qsys.tcl
+++ b/projects/adrv9371x/a10gx/system_qsys.tcl
@@ -3,5 +3,4 @@
 source $ad_hdl_dir/projects/common/a10gx/a10gx_system_qsys.tcl
 source ../common/adrv9371x_qsys.tcl
 
-save_system "system_bd.qsys"
 
diff --git a/projects/adrv9371x/a10soc/system_qsys.tcl b/projects/adrv9371x/a10soc/system_qsys.tcl
index 2b861df8a..7581f7875 100644
--- a/projects/adrv9371x/a10soc/system_qsys.tcl
+++ b/projects/adrv9371x/a10soc/system_qsys.tcl
@@ -3,5 +3,4 @@
 source $ad_hdl_dir/projects/common/a10soc/a10soc_system_qsys.tcl
 source ../common/adrv9371x_qsys.tcl
 
-save_system "system_bd.qsys"
 
diff --git a/projects/common/altera/sys_gen.tcl b/projects/common/altera/sys_gen.tcl
index 25eaa37ad..0b26fb5ab 100644
--- a/projects/common/altera/sys_gen.tcl
+++ b/projects/common/altera/sys_gen.tcl
@@ -28,8 +28,18 @@ puts $QFILE "set mmu_enabled $mmu_enabled"
 puts $QFILE "set ad_hdl_dir $ad_hdl_dir"
 puts $QFILE "set ad_phdl_dir $ad_phdl_dir"
 puts $QFILE "source system_qsys.tcl"
+puts $QFILE "set_interconnect_requirement {\$system} {qsys_mm.clockCrossingAdapter} {FIFO}"
+puts $QFILE "set_interconnect_requirement {\$system} {qsys_mm.maxAdditionalLatency} {2}"
+puts $QFILE "save_system {system_bd.qsys}"
 close $QFILE
 
 exec -ignorestderr $quartus(quartus_rootpath)/sopc_builder/bin/qsys-script \
   --script=system_qsys_script.tcl
 
+# remove altshift_taps
+
+set_instance_assignment -name AUTO_SHIFT_REGISTER_RECOGNITION OFF -to * -entity up_xfer_cntrl
+set_instance_assignment -name AUTO_SHIFT_REGISTER_RECOGNITION OFF -to * -entity up_xfer_status
+set_instance_assignment -name AUTO_SHIFT_REGISTER_RECOGNITION OFF -to * -entity up_clock_mon
+set_instance_assignment -name AUTO_SHIFT_REGISTER_RECOGNITION OFF -to * -entity ad_rst
+
diff --git a/projects/daq1/a10gx/system_qsys.tcl b/projects/daq1/a10gx/system_qsys.tcl
index aceed4aac..03e9d49f3 100644
--- a/projects/daq1/a10gx/system_qsys.tcl
+++ b/projects/daq1/a10gx/system_qsys.tcl
@@ -2,5 +2,4 @@
 source $ad_hdl_dir/projects/common/a10gx/a10gx_system_qsys.tcl
 source ../common/daq1_qsys.tcl
 
-save_system "system_bd.qsys"
 
diff --git a/projects/daq2/a10gx/system_qsys.tcl b/projects/daq2/a10gx/system_qsys.tcl
index 2216c761a..47d33019c 100644
--- a/projects/daq2/a10gx/system_qsys.tcl
+++ b/projects/daq2/a10gx/system_qsys.tcl
@@ -2,5 +2,4 @@
 source $ad_hdl_dir/projects/common/a10gx/a10gx_system_qsys.tcl
 source ../common/daq2_qsys.tcl
 
-save_system "system_bd.qsys"
 
diff --git a/projects/daq3/a10gx/system_qsys.tcl b/projects/daq3/a10gx/system_qsys.tcl
index b2209593e..9b5d24188 100644
--- a/projects/daq3/a10gx/system_qsys.tcl
+++ b/projects/daq3/a10gx/system_qsys.tcl
@@ -3,5 +3,4 @@
 source $ad_hdl_dir/projects/common/a10gx/a10gx_system_qsys.tcl
 source ../common/daq3_qsys.tcl
 
-save_system "system_bd.qsys"
 
diff --git a/projects/fmcjesdadc1/a5gt/system_qsys.tcl b/projects/fmcjesdadc1/a5gt/system_qsys.tcl
index d0094590a..deb2e98ce 100644
--- a/projects/fmcjesdadc1/a5gt/system_qsys.tcl
+++ b/projects/fmcjesdadc1/a5gt/system_qsys.tcl
@@ -2,5 +2,4 @@
 source $ad_hdl_dir/projects/common/a5gt/a5gt_system_qsys.tcl
 source ../common/fmcjesdadc1_qsys.tcl
 
-save_system "system_bd.qsys"
 
diff --git a/projects/fmcjesdadc1/a5soc/system_qsys.tcl b/projects/fmcjesdadc1/a5soc/system_qsys.tcl
index 72ef9d073..de697ac32 100644
--- a/projects/fmcjesdadc1/a5soc/system_qsys.tcl
+++ b/projects/fmcjesdadc1/a5soc/system_qsys.tcl
@@ -3,5 +3,4 @@ source $ad_hdl_dir/projects/common/a5soc/a5soc_system_qsys.tcl
 source ../common/fmcjesdadc1_qsys.tcl
 
 set_instance_parameter_value avl_ad9250_xcvr {SYSCLK_FREQUENCY} {50.0}
-save_system "system_bd.qsys"
 
diff --git a/projects/fmcomms2/a10gx/system_qsys.tcl b/projects/fmcomms2/a10gx/system_qsys.tcl
index 04e76cacf..0e76976f5 100644
--- a/projects/fmcomms2/a10gx/system_qsys.tcl
+++ b/projects/fmcomms2/a10gx/system_qsys.tcl
@@ -2,5 +2,4 @@
 source $ad_hdl_dir/projects/common/a10gx/a10gx_system_qsys.tcl
 source ../common/fmcomms2_qsys.tcl
 
-save_system "system_bd.qsys"
 
diff --git a/projects/usdrx1/a5gt/system_qsys.tcl b/projects/usdrx1/a5gt/system_qsys.tcl
index 968d1161c..cf7c6ae15 100644
--- a/projects/usdrx1/a5gt/system_qsys.tcl
+++ b/projects/usdrx1/a5gt/system_qsys.tcl
@@ -2,5 +2,4 @@
 source $ad_hdl_dir/projects/common/a5gt/a5gt_system_qsys.tcl
 source ../common/usdrx1_qsys.tcl
 
-save_system "system_bd.qsys"