diff --git a/projects/fmcadc2/common/fmcadc2_bd.tcl b/projects/fmcadc2/common/fmcadc2_bd.tcl
index 74c278f52..4c3ac3a62 100644
--- a/projects/fmcadc2/common/fmcadc2_bd.tcl
+++ b/projects/fmcadc2/common/fmcadc2_bd.tcl
@@ -1,13 +1,22 @@
 
 source $ad_hdl_dir/library/jesd204/scripts/jesd204.tcl
 
+# JESD204B interface configuration parameters
+set RX_NUM_OF_LANES 8
+set RX_NUM_OF_CONVERTERS 1
+set RX_SAMPLES_PER_FRAME 4
+set RX_SAMPLE_WIDTH 16
+
 set adc_fifo_name axi_ad9625_fifo
 set adc_data_width 256
 set adc_dma_data_width 64
 
 # adc peripherals
 
-ad_ip_instance axi_ad9625 axi_ad9625_core
+adi_tpl_jesd204_rx_create axi_ad9625_core $RX_NUM_OF_LANES \
+                                          $RX_NUM_OF_CONVERTERS \
+                                          $RX_SAMPLES_PER_FRAME \
+                                          $RX_SAMPLE_WIDTH \
 
 adi_axi_jesd204_rx_create axi_ad9625_jesd 8
 
@@ -59,17 +68,18 @@ ad_connect  $sys_cpu_clk util_fmcadc2_xcvr/up_clk
 # connections (adc)
 
 ad_xcvrcon  util_fmcadc2_xcvr axi_ad9625_xcvr axi_ad9625_jesd
-ad_connect  util_fmcadc2_xcvr/rx_out_clk_0 axi_ad9625_core/rx_clk
+ad_connect  util_fmcadc2_xcvr/rx_out_clk_0 axi_ad9625_core/link_clk
 ad_connect  rx_core_clk util_fmcadc2_xcvr/rx_out_clk_0
-ad_connect  axi_ad9625_jesd/rx_data_tdata axi_ad9625_core/rx_data
-ad_connect  axi_ad9625_jesd/rx_sof axi_ad9625_core/rx_sof
+ad_connect  axi_ad9625_jesd/rx_data_tdata axi_ad9625_core/link_data
+ad_connect  axi_ad9625_jesd/rx_sof axi_ad9625_core/link_sof
+ad_connect  axi_ad9625_jesd/rx_data_tvalid axi_ad9625_core/link_valid
 ad_connect  $sys_cpu_clk axi_ad9625_fifo/dma_clk
 ad_connect  $sys_cpu_clk axi_ad9625_dma/s_axis_aclk
 ad_connect  $sys_cpu_resetn axi_ad9625_dma/m_dest_axi_aresetn
-ad_connect  axi_ad9625_core/adc_clk axi_ad9625_fifo/adc_clk
+ad_connect  axi_ad9625_core/link_clk axi_ad9625_fifo/adc_clk
 ad_connect  axi_ad9625_jesd_rstgen/peripheral_reset axi_ad9625_fifo/adc_rst
-ad_connect  axi_ad9625_core/adc_enable axi_ad9625_fifo/adc_wr
-ad_connect  axi_ad9625_core/adc_data axi_ad9625_fifo/adc_wdata
+ad_connect  axi_ad9625_core/adc_enable_0 axi_ad9625_fifo/adc_wr
+ad_connect  axi_ad9625_core/adc_data_0 axi_ad9625_fifo/adc_wdata
 ad_connect  axi_ad9625_core/adc_dovf axi_ad9625_fifo/adc_wovf
 ad_connect  axi_ad9625_fifo/dma_wr axi_ad9625_dma/s_axis_valid
 ad_connect  axi_ad9625_fifo/dma_wdata axi_ad9625_dma/s_axis_data
diff --git a/projects/fmcadc2/vc707/Makefile b/projects/fmcadc2/vc707/Makefile
index da6271160..3351782e7 100644
--- a/projects/fmcadc2/vc707/Makefile
+++ b/projects/fmcadc2/vc707/Makefile
@@ -17,9 +17,9 @@ M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl
 M_DEPS += ../../../library/common/ad_sysref_gen.v
 M_DEPS += ../../../library/common/ad_iobuf.v
 
-LIB_DEPS += axi_ad9625
 LIB_DEPS += axi_dmac
 LIB_DEPS += axi_sysid
+LIB_DEPS += jesd204/ad_ip_jesd204_tpl_adc
 LIB_DEPS += jesd204/axi_jesd204_rx
 LIB_DEPS += jesd204/jesd204_rx
 LIB_DEPS += sysid_rom
diff --git a/projects/fmcadc2/zc706/Makefile b/projects/fmcadc2/zc706/Makefile
index 41a14cf03..094a9c41e 100644
--- a/projects/fmcadc2/zc706/Makefile
+++ b/projects/fmcadc2/zc706/Makefile
@@ -17,12 +17,12 @@ M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl
 M_DEPS += ../../../library/common/ad_sysref_gen.v
 M_DEPS += ../../../library/common/ad_iobuf.v
 
-LIB_DEPS += axi_ad9625
 LIB_DEPS += axi_clkgen
 LIB_DEPS += axi_dmac
 LIB_DEPS += axi_hdmi_tx
 LIB_DEPS += axi_spdif_tx
 LIB_DEPS += axi_sysid
+LIB_DEPS += jesd204/ad_ip_jesd204_tpl_adc
 LIB_DEPS += jesd204/axi_jesd204_rx
 LIB_DEPS += jesd204/jesd204_rx
 LIB_DEPS += sysid_rom
diff --git a/projects/fmcadc2/zc706/system_project.tcl b/projects/fmcadc2/zc706/system_project.tcl
index 40fedd35b..e2e381dc3 100644
--- a/projects/fmcadc2/zc706/system_project.tcl
+++ b/projects/fmcadc2/zc706/system_project.tcl
@@ -13,20 +13,4 @@ adi_project_files fmcadc2_zc706 [list \
   "$ad_hdl_dir/projects/common/zc706/zc706_plddr3_constr.xdc" \
   "$ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc" ]
 
-adi_project_run fmcadc2_zc706
-
-ad_ip_instance ila ila_core
-ad_ip_parameter ila_core CONFIG.C_MONITOR_TYPE Native
-ad_ip_parameter ila_core CONFIG.C_TRIGIN_EN false
-ad_ip_parameter ila_core CONFIG.C_EN_STRG_QUAL 1
-ad_ip_parameter ila_core CONFIG.C_NUM_OF_PROBES 4
-ad_ip_parameter ila_core CONFIG.C_PROBE0_WIDTH 1
-ad_ip_parameter ila_core CONFIG.C_PROBE1_WIDTH 1
-ad_ip_parameter ila_core CONFIG.C_PROBE2_WIDTH 1
-ad_ip_parameter ila_core CONFIG.C_PROBE3_WIDTH 256
-
-ad_connect  axi_ad9625_core/adc_clk ila_core/clk
-ad_connect  axi_ad9625_core/adc_rst ila_core/probe0
-ad_connect  axi_ad9625_core/adc_valid ila_core/probe1
-ad_connect  axi_ad9625_core/rx_ready ila_core/probe2
-ad_connect  axi_ad9625_core/adc_data ila_core/probe3
+adi_project_run fmcadc2_zc706
\ No newline at end of file