diff --git a/projects/fmcjesdadc1/a5gt/system_bd.qsys b/projects/fmcjesdadc1/a5gt/system_bd.qsys
deleted file mode 100644
index 482a3db95..000000000
--- a/projects/fmcjesdadc1/a5gt/system_bd.qsys
+++ /dev/null
@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<system name="$${FILENAME}">
- <component
-   name="$${FILENAME}"
-   displayName="$${FILENAME}"
-   version="1.0"
-   description=""
-   tags=""
-   categories="System" />
- <parameter name="bonusData"><![CDATA[bonusData 
-{
-   element a5gt_base
-   {
-      datum _sortIndex
-      {
-         value = "1";
-         type = "int";
-      }
-   }
-   element a5gt_base.sys_mem_interconnect_s0
-   {
-      datum baseAddress
-      {
-         value = "0";
-         type = "String";
-      }
-   }
-   element fmcjesdadc1
-   {
-      datum _sortIndex
-      {
-         value = "2";
-         type = "int";
-      }
-   }
-   element fmcjesdadc1.axi_ad9250_0_s_axi
-   {
-      datum baseAddress
-      {
-         value = "131072";
-         type = "String";
-      }
-   }
-   element fmcjesdadc1.axi_ad9250_1_s_axi
-   {
-      datum baseAddress
-      {
-         value = "65536";
-         type = "String";
-      }
-   }
-   element fmcjesdadc1.axi_dmac_0_s_axi
-   {
-      datum baseAddress
-      {
-         value = "212992";
-         type = "String";
-      }
-   }
-   element fmcjesdadc1.axi_dmac_1_s_axi
-   {
-      datum baseAddress
-      {
-         value = "196608";
-         type = "String";
-      }
-   }
-   element fmcjesdadc1.axi_jesd204_rx_avs
-   {
-      datum baseAddress
-      {
-         value = "262144";
-         type = "String";
-      }
-   }
-   element fmcjesdadc1.axi_jesd_xcvr_s_axi
-   {
-      datum baseAddress
-      {
-         value = "0";
-         type = "String";
-      }
-   }
-   element sys_clk
-   {
-      datum _sortIndex
-      {
-         value = "0";
-         type = "int";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-   element system_bd
-   {
-      datum _originalDeviceFamily
-      {
-         value = "Arria V";
-         type = "String";
-      }
-   }
-}
-]]></parameter>
- <parameter name="clockCrossingAdapter" value="FIFO" />
- <parameter name="device" value="5AGTFD7K3F40I3" />
- <parameter name="deviceFamily" value="Arria V" />
- <parameter name="deviceSpeedGrade" value="3_H3" />
- <parameter name="fabricMode" value="QSYS" />
- <parameter name="generateLegacySim" value="false" />
- <parameter name="generationId" value="0" />
- <parameter name="globalResetBus" value="false" />
- <parameter name="hdlLanguage" value="VERILOG" />
- <parameter name="hideFromIPCatalog" value="false" />
- <parameter name="lockedInterfaceDefinition" value="" />
- <parameter name="maxAdditionalLatency" value="2" />
- <parameter name="projectName">fmcjesdadc1_a5gt.qpf</parameter>
- <parameter name="sopcBorderPoints" value="false" />
- <parameter name="systemHash" value="0" />
- <parameter name="testBenchDutName" value="" />
- <parameter name="timeStamp" value="0" />
- <parameter name="useTestBenchNamingPattern" value="false" />
- <instanceScript></instanceScript>
- <interface
-   name="a5gt_base_sys_125m_clk"
-   internal="a5gt_base.sys_125m_clk"
-   type="clock"
-   dir="start" />
- <interface
-   name="a5gt_base_sys_25m_clk"
-   internal="a5gt_base.sys_25m_clk"
-   type="clock"
-   dir="start" />
- <interface
-   name="a5gt_base_sys_2m5_clk"
-   internal="a5gt_base.sys_2m5_clk"
-   type="clock"
-   dir="start" />
- <interface
-   name="a5gt_base_sys_ddr3_oct"
-   internal="a5gt_base.sys_ddr3_oct"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_ddr3_phy"
-   internal="a5gt_base.sys_ddr3_phy"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_ethernet_mdio"
-   internal="a5gt_base.sys_ethernet_mdio"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_ethernet_rgmii"
-   internal="a5gt_base.sys_ethernet_rgmii"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_ethernet_rx_clk"
-   internal="a5gt_base.sys_ethernet_rx_clk"
-   type="clock"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_ethernet_status"
-   internal="a5gt_base.sys_ethernet_status"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_ethernet_tx_clk"
-   internal="a5gt_base.sys_ethernet_tx_clk"
-   type="clock"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_gpio"
-   internal="a5gt_base.sys_gpio"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_gpio_bd"
-   internal="a5gt_base.sys_gpio_bd"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_pll_locked"
-   internal="a5gt_base.sys_pll_locked"
-   type="conduit"
-   dir="end" />
- <interface
-   name="a5gt_base_sys_spi"
-   internal="a5gt_base.sys_spi"
-   type="conduit"
-   dir="end" />
- <interface
-   name="rx_data"
-   internal="fmcjesdadc1.rx_data"
-   type="conduit"
-   dir="end" />
- <interface
-   name="rx_ref_clk"
-   internal="fmcjesdadc1.rx_ref_clk"
-   type="clock"
-   dir="end" />
- <interface
-   name="rx_sync"
-   internal="fmcjesdadc1.rx_sync"
-   type="conduit"
-   dir="end" />
- <interface
-   name="rx_sysref"
-   internal="fmcjesdadc1.rx_sysref"
-   type="conduit"
-   dir="end" />
- <interface name="sys_clk" internal="sys_clk.clk_in" type="clock" dir="end" />
- <interface
-   name="sys_reset"
-   internal="sys_clk.clk_in_reset"
-   type="reset"
-   dir="end" />
- <module name="a5gt_base" kind="a5gt_system_bd" version="1.0" enabled="1">
-  <parameter name="AUTO_DEVICE" value="5AGTFD7K3F40I3" />
-  <parameter name="AUTO_DEVICE_FAMILY" value="Arria V" />
-  <parameter name="AUTO_DEVICE_SPEEDGRADE" value="3_H3" />
-  <parameter name="AUTO_GENERATION_ID" value="0" />
-  <parameter name="AUTO_SYS_CLK_CLOCK_DOMAIN" value="7" />
-  <parameter name="AUTO_SYS_CLK_CLOCK_RATE" value="100000000" />
-  <parameter name="AUTO_SYS_CLK_RESET_DOMAIN" value="7" />
-  <parameter name="AUTO_SYS_CPU_INTERCONNECT_M0_ADDRESS_MAP"><![CDATA[<address-map><slave name='fmcjesdadc1_axi_jesd_xcvr.s_axi' start='0x0' end='0x10000' /><slave name='fmcjesdadc1_axi_ad9250_1.s_axi' start='0x10000' end='0x20000' /><slave name='fmcjesdadc1_axi_ad9250_0.s_axi' start='0x20000' end='0x30000' /><slave name='fmcjesdadc1_axi_dmac_1.s_axi' start='0x30000' end='0x34000' /><slave name='fmcjesdadc1_axi_dmac_0.s_axi' start='0x34000' end='0x38000' /></address-map>]]></parameter>
-  <parameter
-     name="AUTO_SYS_CPU_INTERCONNECT_M0_ADDRESS_WIDTH"
-     value="AddressWidth = 18" />
-  <parameter name="AUTO_SYS_ETHERNET_RX_CLK_CLOCK_DOMAIN" value="4" />
-  <parameter name="AUTO_SYS_ETHERNET_RX_CLK_CLOCK_RATE" value="0" />
-  <parameter name="AUTO_SYS_ETHERNET_RX_CLK_RESET_DOMAIN" value="4" />
-  <parameter name="AUTO_SYS_ETHERNET_TX_CLK_CLOCK_DOMAIN" value="5" />
-  <parameter name="AUTO_SYS_ETHERNET_TX_CLK_CLOCK_RATE" value="0" />
-  <parameter name="AUTO_SYS_ETHERNET_TX_CLK_RESET_DOMAIN" value="5" />
-  <parameter name="AUTO_SYS_INTR_INTERRUPTS_USED" value="3" />
-  <parameter name="AUTO_UNIQUE_ID">$${FILENAME}_a5gt_base</parameter>
- </module>
- <module name="fmcjesdadc1" kind="fmcjesdadc1_bd" version="1.0" enabled="1">
-  <parameter name="AUTO_AXI_DMAC_0_M_AXI_ADDRESS_MAP"><![CDATA[<address-map><slave name='a5gt_base_sys_ddr3_cntrl.avl' start='0x0' end='0x10000000' /></address-map>]]></parameter>
-  <parameter name="AUTO_AXI_DMAC_0_M_AXI_ADDRESS_WIDTH" value="AddressWidth = 28" />
-  <parameter name="AUTO_AXI_DMAC_1_M_AXI_ADDRESS_MAP"><![CDATA[<address-map><slave name='a5gt_base_sys_ddr3_cntrl.avl' start='0x0' end='0x10000000' /></address-map>]]></parameter>
-  <parameter name="AUTO_AXI_DMAC_1_M_AXI_ADDRESS_WIDTH" value="AddressWidth = 28" />
-  <parameter name="AUTO_CPU_CLK_CLOCK_DOMAIN" value="9" />
-  <parameter name="AUTO_CPU_CLK_CLOCK_RATE" value="100000000" />
-  <parameter name="AUTO_CPU_CLK_RESET_DOMAIN" value="9" />
-  <parameter name="AUTO_DEVICE" value="5AGTFD7K3F40I3" />
-  <parameter name="AUTO_DEVICE_FAMILY" value="Arria V" />
-  <parameter name="AUTO_DEVICE_SPEEDGRADE" value="3_H3" />
-  <parameter name="AUTO_GENERATION_ID" value="0" />
-  <parameter name="AUTO_MEM_CLK_CLOCK_DOMAIN" value="10" />
-  <parameter name="AUTO_MEM_CLK_CLOCK_RATE" value="100000000" />
-  <parameter name="AUTO_MEM_CLK_RESET_DOMAIN" value="10" />
-  <parameter name="AUTO_RX_REF_CLK_CLOCK_DOMAIN" value="6" />
-  <parameter name="AUTO_RX_REF_CLK_CLOCK_RATE" value="0" />
-  <parameter name="AUTO_RX_REF_CLK_RESET_DOMAIN" value="6" />
-  <parameter name="AUTO_UNIQUE_ID">$${FILENAME}_fmcjesdadc1</parameter>
- </module>
- <module name="sys_clk" kind="clock_source" version="15.1" enabled="1">
-  <parameter name="clockFrequency" value="100000000" />
-  <parameter name="clockFrequencyKnown" value="true" />
-  <parameter name="inputClockFrequency" value="0" />
-  <parameter name="resetSynchronousEdges" value="NONE" />
- </module>
- <connection
-   kind="avalon"
-   version="15.1"
-   start="fmcjesdadc1.axi_dmac_0_m_axi"
-   end="a5gt_base.sys_mem_interconnect_s0">
-  <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x0000" />
-  <parameter name="defaultConnection" value="false" />
- </connection>
- <connection
-   kind="avalon"
-   version="15.1"
-   start="fmcjesdadc1.axi_dmac_1_m_axi"
-   end="a5gt_base.sys_mem_interconnect_s0">
-  <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x0000" />
-  <parameter name="defaultConnection" value="false" />
- </connection>
- <connection
-   kind="avalon"
-   version="15.1"
-   start="a5gt_base.sys_cpu_interconnect_m0"
-   end="fmcjesdadc1.axi_ad9250_0_s_axi">
-  <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00020000" />
-  <parameter name="defaultConnection" value="false" />
- </connection>
- <connection
-   kind="avalon"
-   version="15.1"
-   start="a5gt_base.sys_cpu_interconnect_m0"
-   end="fmcjesdadc1.axi_ad9250_1_s_axi">
-  <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00010000" />
-  <parameter name="defaultConnection" value="false" />
- </connection>
- <connection
-   kind="avalon"
-   version="15.1"
-   start="a5gt_base.sys_cpu_interconnect_m0"
-   end="fmcjesdadc1.axi_dmac_0_s_axi">
-  <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00034000" />
-  <parameter name="defaultConnection" value="false" />
- </connection>
- <connection
-   kind="avalon"
-   version="15.1"
-   start="a5gt_base.sys_cpu_interconnect_m0"
-   end="fmcjesdadc1.axi_dmac_1_s_axi">
-  <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x00030000" />
-  <parameter name="defaultConnection" value="false" />
- </connection>
- <connection
-   kind="avalon"
-   version="15.1"
-   start="a5gt_base.sys_cpu_interconnect_m0"
-   end="fmcjesdadc1.axi_jesd_xcvr_s_axi">
-  <parameter name="arbitrationPriority" value="1" />
-  <parameter name="baseAddress" value="0x0000" />
-  <parameter name="defaultConnection" value="false" />
- </connection>
- <connection
-   kind="clock"
-   version="15.1"
-   start="sys_clk.clk"
-   end="a5gt_base.sys_clk" />
- <connection
-   kind="clock"
-   version="15.1"
-   start="a5gt_base.cpu_clk"
-   end="fmcjesdadc1.cpu_clk" />
- <connection
-   kind="clock"
-   version="15.1"
-   start="a5gt_base.mem_clk"
-   end="fmcjesdadc1.mem_clk" />
- <connection
-   kind="interrupt"
-   version="15.1"
-   start="a5gt_base.sys_intr"
-   end="fmcjesdadc1.axi_dmac_0_intr">
-  <parameter name="irqNumber" value="1" />
- </connection>
- <connection
-   kind="interrupt"
-   version="15.1"
-   start="a5gt_base.sys_intr"
-   end="fmcjesdadc1.axi_dmac_1_intr">
-  <parameter name="irqNumber" value="0" />
- </connection>
- <connection
-   kind="reset"
-   version="15.1"
-   start="sys_clk.clk_reset"
-   end="a5gt_base.sys_rst" />
- <connection
-   kind="reset"
-   version="15.1"
-   start="a5gt_base.cpu_rst"
-   end="fmcjesdadc1.cpu_rst" />
- <connection
-   kind="reset"
-   version="15.1"
-   start="a5gt_base.mem_rst"
-   end="fmcjesdadc1.mem_rst" />
- <interconnectRequirement for="$system" name="qsys_mm.clockCrossingAdapter" value="FIFO" />
- <interconnectRequirement for="$system" name="qsys_mm.insertDefaultSlave" value="false" />
- <interconnectRequirement for="$system" name="qsys_mm.maxAdditionalLatency" value="2" />
-</system>
diff --git a/projects/fmcjesdadc1/a5gt/system_qsys.tcl b/projects/fmcjesdadc1/a5gt/system_qsys.tcl
new file mode 100644
index 000000000..3537ec761
--- /dev/null
+++ b/projects/fmcjesdadc1/a5gt/system_qsys.tcl
@@ -0,0 +1,6 @@
+
+source $ad_hdl_dir/projects/common/a5soc/a5soc_system_qsys.tcl
+source ../common/fmcjesdadc1_qsys.tcl
+
+save_system "system_bd.qsys"
+