diff --git a/projects/common/a10soc/a10soc_system_assign.tcl b/projects/common/a10soc/a10soc_system_assign.tcl
index 913fe193b..fe465eb13 100755
--- a/projects/common/a10soc/a10soc_system_assign.tcl
+++ b/projects/common/a10soc/a10soc_system_assign.tcl
@@ -2,7 +2,7 @@
 # device settings
 
 set_global_assignment -name FAMILY "Arria 10"
-set_global_assignment -name DEVICE 10AS066N3F40I2LG
+set_global_assignment -name DEVICE 10AS066N3F40E2SGE2
 
 # clocks and resets
 
diff --git a/projects/common/a10soc/a10soc_system_bd.qsys b/projects/common/a10soc/a10soc_system_bd.qsys
index 7eeb3ca66..e999e15d9 100644
--- a/projects/common/a10soc/a10soc_system_bd.qsys
+++ b/projects/common/a10soc/a10soc_system_bd.qsys
@@ -276,7 +276,7 @@
 }
 ]]></parameter>
  <parameter name="clockCrossingAdapter" value="FIFO" />
- <parameter name="device" value="10AS066N3F40I2LG" />
+ <parameter name="device" value="10AS066N3F40I2SGES" />
  <parameter name="deviceFamily" value="Arria 10" />
  <parameter name="deviceSpeedGrade" value="2" />
  <parameter name="fabricMode" value="QSYS" />
@@ -329,21 +329,13 @@
    internal="arria10_hps_0.f2h_irq1"
    type="interrupt"
    dir="start" />
- <interface
-   name="hps_s0_axi"
-   internal="arria10_hps_0.f2sdram0_data"
-   type="axi"
-   dir="end" />
+ <interface name="hps_s0_axi" internal="arria10_hps_0.f2sdram0_data" />
  <interface
    name="hps_s1_axi"
    internal="arria10_hps_0.f2sdram1_data"
    type="axi"
    dir="end" />
- <interface
-   name="hps_s2_axi"
-   internal="arria10_hps_0.f2sdram2_data"
-   type="axi"
-   dir="end" />
+ <interface name="hps_s2_axi" internal="arria10_hps_0.f2sdram2_data" />
  <interface
    name="hps_spi0"
    internal="arria10_hps_0.spim0"
@@ -435,9 +427,9 @@
   <parameter name="F2H_SDRAM4_CLOCK_FREQ" value="100" />
   <parameter name="F2H_SDRAM5_CLOCK_FREQ" value="100" />
   <parameter name="F2H_WARM_RST_Enable" value="false" />
-  <parameter name="F2SDRAM0_ENABLED" value="true" />
+  <parameter name="F2SDRAM0_ENABLED" value="false" />
   <parameter name="F2SDRAM1_ENABLED" value="true" />
-  <parameter name="F2SDRAM2_ENABLED" value="true" />
+  <parameter name="F2SDRAM2_ENABLED" value="false" />
   <parameter name="F2SDRAM_ADDRESS_WIDTH" value="32" />
   <parameter name="F2SDRAM_PORT_CONFIG" value="5" />
   <parameter name="F2SDRAM_READY_LATENCY" value="false" />
@@ -586,7 +578,7 @@
   <parameter name="USB1_Mode" value="N/A" />
   <parameter name="USB1_PinMuxing" value="Unused" />
   <parameter name="USE_DEFAULT_MPU_CLK" value="false" />
-  <parameter name="device_name" value="10AS066N3F40I2LG" />
+  <parameter name="device_name" value="10AS066N3F40I2SGES" />
   <parameter name="eosc1_clk_mhz" value="25.0" />
   <parameter name="quartus_ini_hps_ip_boot_from_fpga_ready" value="false" />
   <parameter name="quartus_ini_hps_ip_enable_a10_advanced_options" value="false" />
@@ -1536,7 +1528,7 @@
   <parameter name="PLL_USER_NUM_OF_EXTRA_CLKS" value="0" />
   <parameter name="PROTOCOL_ENUM" value="PROTOCOL_DDR4" />
   <parameter name="SHORT_QSYS_INTERFACE_NAMES" value="false" />
-  <parameter name="SYS_INFO_DEVICE" value="10AS066N3F40I2LG" />
+  <parameter name="SYS_INFO_DEVICE" value="10AS066N3F40I2SGES" />
   <parameter name="SYS_INFO_DEVICE_FAMILY" value="Arria 10" />
   <parameter name="SYS_INFO_DEVICE_SPEEDGRADE" value="2" />
   <parameter name="SYS_INFO_UNIQUE_ID">$${FILENAME}_emif_a10_hps_0</parameter>
@@ -1605,21 +1597,11 @@
    start="sys_clk.out_clk"
    end="sys_cpu_interconnect.clk" />
  <connection kind="clock" version="15.1" start="sys_clk.out_clk" end="sys_rst.clk" />
- <connection
-   kind="clock"
-   version="15.1"
-   start="sys_clk.out_clk"
-   end="arria10_hps_0.f2sdram0_clock" />
  <connection
    kind="clock"
    version="15.1"
    start="sys_clk.out_clk"
    end="arria10_hps_0.f2sdram1_clock" />
- <connection
-   kind="clock"
-   version="15.1"
-   start="sys_clk.out_clk"
-   end="arria10_hps_0.f2sdram2_clock" />
  <connection
    kind="clock"
    version="15.1"
diff --git a/projects/fmcomms2/a10soc/system_bd.qsys b/projects/fmcomms2/a10soc/system_bd.qsys
index b5ef80675..907e4c349 100755
--- a/projects/fmcomms2/a10soc/system_bd.qsys
+++ b/projects/fmcomms2/a10soc/system_bd.qsys
@@ -17,14 +17,6 @@
          type = "int";
       }
    }
-   element a10soc.hps_s0_axi
-   {
-      datum baseAddress
-      {
-         value = "0";
-         type = "String";
-      }
-   }
    element a10soc.hps_s1_axi
    {
       datum baseAddress
@@ -300,7 +292,7 @@
 }
 ]]></parameter>
  <parameter name="clockCrossingAdapter" value="FIFO" />
- <parameter name="device" value="10AS066N3F40I2LG" />
+ <parameter name="device" value="10AS066N3F40I2SGES" />
  <parameter name="deviceFamily" value="Arria 10" />
  <parameter name="deviceSpeedGrade" value="2" />
  <parameter name="fabricMode" value="QSYS" />
@@ -355,27 +347,27 @@
    type="reset"
    dir="end" />
  <module name="a10soc" kind="a10soc_system_bd" version="1.0" enabled="1">
-  <parameter name="AUTO_DEVICE" value="10AS066N3F40I2LG" />
+  <parameter name="AUTO_DEVICE" value="10AS066N3F40I2SGES" />
   <parameter name="AUTO_DEVICE_FAMILY" value="Arria 10" />
   <parameter name="AUTO_DEVICE_SPEEDGRADE" value="2" />
   <parameter name="AUTO_GENERATION_ID" value="0" />
-  <parameter name="AUTO_HPS_DDR_REF_CLK_CLOCK_DOMAIN" value="1" />
+  <parameter name="AUTO_HPS_DDR_REF_CLK_CLOCK_DOMAIN" value="4" />
   <parameter name="AUTO_HPS_DDR_REF_CLK_CLOCK_RATE" value="0" />
-  <parameter name="AUTO_HPS_DDR_REF_CLK_RESET_DOMAIN" value="1" />
+  <parameter name="AUTO_HPS_DDR_REF_CLK_RESET_DOMAIN" value="4" />
   <parameter name="AUTO_HPS_IRQ0_INTERRUPTS_USED" value="3" />
   <parameter name="AUTO_HPS_IRQ1_INTERRUPTS_USED" value="3" />
-  <parameter name="AUTO_SYS_CLK_CLOCK_DOMAIN" value="4" />
+  <parameter name="AUTO_SYS_CLK_CLOCK_DOMAIN" value="3" />
   <parameter name="AUTO_SYS_CLK_CLOCK_RATE" value="100000000" />
-  <parameter name="AUTO_SYS_CLK_RESET_DOMAIN" value="4" />
+  <parameter name="AUTO_SYS_CLK_RESET_DOMAIN" value="3" />
   <parameter name="AUTO_SYS_CPU_M_AVL_ADDRESS_MAP"><![CDATA[<address-map><slave name='fmcomms2_axi_ad9361.s_axi' start='0x0' end='0x10000' /><slave name='fmcomms2_axi_dmac_dac.s_axi' start='0x10000' end='0x14000' /><slave name='fmcomms2_axi_dmac_adc.s_axi' start='0x14000' end='0x18000' /></address-map>]]></parameter>
   <parameter name="AUTO_SYS_CPU_M_AVL_ADDRESS_WIDTH" value="AddressWidth = 17" />
-  <parameter name="AUTO_UNIQUE_ID" value="$${FILENAME}_a10soc" />
+  <parameter name="AUTO_UNIQUE_ID" value="system_bd_a10soc" />
  </module>
  <module name="fmcomms2" kind="fmcomms2_bd" version="1.0" enabled="1">
-  <parameter name="AUTO_AXI_AD9361_DEVICE_CLOCK_CLOCK_DOMAIN" value="6" />
+  <parameter name="AUTO_AXI_AD9361_DEVICE_CLOCK_CLOCK_DOMAIN" value="2" />
   <parameter name="AUTO_AXI_AD9361_DEVICE_CLOCK_CLOCK_RATE" value="0" />
-  <parameter name="AUTO_AXI_AD9361_DEVICE_CLOCK_RESET_DOMAIN" value="6" />
-  <parameter name="AUTO_AXI_DMAC_ADC_M_DEST_AXI_ADDRESS_MAP"><![CDATA[<address-map><slave name='a10soc_arria10_hps_0_bridges.f2sdram0_data' start='0x0' end='0x100000000' /></address-map>]]></parameter>
+  <parameter name="AUTO_AXI_AD9361_DEVICE_CLOCK_RESET_DOMAIN" value="2" />
+  <parameter name="AUTO_AXI_DMAC_ADC_M_DEST_AXI_ADDRESS_MAP"><![CDATA[<address-map><slave name='a10soc_arria10_hps_0_bridges.f2sdram1_data' start='0x0' end='0x100000000' /></address-map>]]></parameter>
   <parameter
      name="AUTO_AXI_DMAC_ADC_M_DEST_AXI_ADDRESS_WIDTH"
      value="AddressWidth = 32" />
@@ -383,14 +375,14 @@
   <parameter
      name="AUTO_AXI_DMAC_DAC_M_SRC_AXI_ADDRESS_WIDTH"
      value="AddressWidth = 32" />
-  <parameter name="AUTO_DEVICE" value="10AS066N3F40I2LG" />
+  <parameter name="AUTO_DEVICE" value="10AS066N3F40I2SGES" />
   <parameter name="AUTO_DEVICE_FAMILY" value="Arria 10" />
   <parameter name="AUTO_DEVICE_SPEEDGRADE" value="2" />
   <parameter name="AUTO_GENERATION_ID" value="0" />
-  <parameter name="AUTO_SYS_CLK_CLOCK_DOMAIN" value="4" />
+  <parameter name="AUTO_SYS_CLK_CLOCK_DOMAIN" value="3" />
   <parameter name="AUTO_SYS_CLK_CLOCK_RATE" value="100000000" />
-  <parameter name="AUTO_SYS_CLK_RESET_DOMAIN" value="4" />
-  <parameter name="AUTO_UNIQUE_ID">$${FILENAME}_fmcomms2</parameter>
+  <parameter name="AUTO_SYS_CLK_RESET_DOMAIN" value="3" />
+  <parameter name="AUTO_UNIQUE_ID" value="system_bd_fmcomms2" />
  </module>
  <module name="sys_clk" kind="clock_source" version="15.1" enabled="1">
   <parameter name="clockFrequency" value="100000000" />
@@ -402,7 +394,7 @@
    kind="avalon"
    version="15.1"
    start="fmcomms2.axi_dmac_adc_m_dest_axi"
-   end="a10soc.hps_s0_axi">
+   end="a10soc.hps_s1_axi">
   <parameter name="arbitrationPriority" value="1" />
   <parameter name="baseAddress" value="0x0000" />
   <parameter name="defaultConnection" value="false" />
diff --git a/projects/fmcomms2/common/fmcomms2_bd.qsys b/projects/fmcomms2/common/fmcomms2_bd.qsys
index 4faf07863..8656a32da 100755
--- a/projects/fmcomms2/common/fmcomms2_bd.qsys
+++ b/projects/fmcomms2/common/fmcomms2_bd.qsys
@@ -181,7 +181,7 @@
 }
 ]]></parameter>
  <parameter name="clockCrossingAdapter" value="FIFO" />
- <parameter name="device" value="10AS066N3F40I2LG" />
+ <parameter name="device" value="10AS066N3F40E2SGE2" />
  <parameter name="deviceFamily" value="Arria 10" />
  <parameter name="deviceSpeedGrade" value="2" />
  <parameter name="fabricMode" value="QSYS" />