diff --git a/docs/projects/ad916x_fmc/ad916x_fmc_zcu102_block_diagram.svg b/docs/projects/ad916x_fmc/ad916x_fmc_zcu102_block_diagram.svg
index eefee05060a..30d7b6b19b8 100644
--- a/docs/projects/ad916x_fmc/ad916x_fmc_zcu102_block_diagram.svg
+++ b/docs/projects/ad916x_fmc/ad916x_fmc_zcu102_block_diagram.svg
@@ -4053,15 +4053,15 @@
     <text
        transform="matrix(0,-1.0154636,0.98477188,0,0,0)"
        id="text5798"
-       y="304.23892"
-       x="-1449.0609"
+       y="304.23877"
+       x="-1453.9847"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.9549px;line-height:0%;font-family:Arial;-inkscape-font-specification:'Arial, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.01544px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;shape-rendering:crispEdges;enable-background:new"
        xml:space="preserve"><tspan
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.9549px;line-height:108%;font-family:Arial;-inkscape-font-specification:'Arial, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke:none;stroke-width:1.01544px;stroke-opacity:1"
-         y="304.23892"
-         x="-1449.0609"
+         y="304.23877"
+         x="-1453.9847"
          id="tspan5800"
-         sodipodi:role="line">UTIL_DACFIFO</tspan></text>
+         sodipodi:role="line">DATA_OFFLOAD</tspan></text>
     <text
        transform="matrix(0,-1.0154636,0.98477188,0,0,0)"
        id="text5788-4"
@@ -4086,18 +4086,6 @@
          x="921.31787"
          y="1315.4597"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.7701px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial Bold';stroke-width:1.01544px">JESD PHY</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:12.1852px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.01544px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="277.50955"
-       y="1297.4403"
-       id="text4766-1"
-       transform="scale(0.98477188,1.0154636)"><tspan
-         sodipodi:role="line"
-         id="tspan4768-2"
-         x="277.50955"
-         y="1297.4403"
-         style="font-size:10.1544px;line-height:1.25;stroke-width:1.01544px">1Mbyte</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.1852px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.01544;stroke-miterlimit:4;stroke-dasharray:none;shape-rendering:crispEdges;enable-background:new"
diff --git a/docs/projects/ad916x_fmc/index.rst b/docs/projects/ad916x_fmc/index.rst
index f7de0393717..e4193438b27 100644
--- a/docs/projects/ad916x_fmc/index.rst
+++ b/docs/projects/ad916x_fmc/index.rst
@@ -69,6 +69,10 @@ The data path and clock domains are depicted in the below diagram:
         - :git-hdl:`axi_dmac <library/axi_dmac>`
         - :ref:`axi_dmac`
         - ---
+      * - DATA_OFFLOAD
+        - :git-hdl:`data_offload <library/data_offload>`
+        - :ref:`data_offload`
+        - ---
       * - TX JESD LINK
         - axi_ad916x_jesd
         - :ref:`axi_jesd204_tx`
@@ -81,10 +85,6 @@ The data path and clock domains are depicted in the below diagram:
         - :git-hdl:`library/xilinx/util_adxcvr`
         - :ref:`util_adxcvr`
         - ---
-      * - UTIL_DACFIFO
-        - :git-hdl:`util_dacfifo <library/util_dacfifo>`
-        - ---
-        - ---
       * - UTIL_UPACK
         - :git-hdl:`util_upack2 <library/util_pack/util_upack2>`
         - :ref:`util_upack2`
@@ -156,6 +156,7 @@ dac_jesd204_transport     0x84A0_4000
 dac_jesd204_xcvr          0x84A6_0000
 dac_jesd204_link          0x84A9_0000
 dac_dma                   0x9C42_0000
+dac_data_offload          0x9C43_0000
 ========================  ===========
 
 SPI connections
@@ -311,6 +312,9 @@ HDL related
    * - AXI_ADXCVR for AMD
      - :git-hdl:`library/xilinx/axi_adxcvr`
      - :ref:`axi_adxcvr amd`
+   * - DATA_OFFLOAD
+     - :git-hdl:`library/data_offload`
+     - :ref:`data_offload`
    * - JESD204_TPL_DAC
      - :git-hdl:`library/jesd204/ad_ip_jesd204_tpl_dac`
      - :ref:`ad_ip_jesd204_tpl_dac`
@@ -320,9 +324,6 @@ HDL related
    * - UTIL_ADXCVR for AMD
      - :git-hdl:`library/xilinx/util_adxcvr`
      - :ref:`util_adxcvr`
-   * - UTIL_DACFIFO
-     - :git-hdl:`library/util_dacfifo`
-     - :ref:`util_rfifo`
    * - UTIL_UPACK2
      - :git-hdl:`library/util_pack/util_upack2`
      - :ref:`util_upack2`
diff --git a/projects/ad916x_fmc/zcu102/Makefile b/projects/ad916x_fmc/zcu102/Makefile
index 9f96e01bc4c..9d7184ca97c 100644
--- a/projects/ad916x_fmc/zcu102/Makefile
+++ b/projects/ad916x_fmc/zcu102/Makefile
@@ -11,17 +11,20 @@ M_DEPS += ../../dac_fmc_ebz/common/dac_fmc_ebz_bd.tcl
 M_DEPS += ../../scripts/adi_pd.tcl
 M_DEPS += ../../common/zcu102/zcu102_system_constr.xdc
 M_DEPS += ../../common/zcu102/zcu102_system_bd.tcl
-M_DEPS += ../../common/xilinx/dacfifo_bd.tcl
+M_DEPS += ../../common/xilinx/data_offload_bd.tcl
+M_DEPS += ../../../library/util_hbm/scripts/adi_util_hbm.tcl
 M_DEPS += ../../../library/jesd204/scripts/jesd204.tcl
 M_DEPS += ../../../library/common/ad_iobuf.v
 
 LIB_DEPS += axi_dmac
 LIB_DEPS += axi_sysid
+LIB_DEPS += data_offload
 LIB_DEPS += jesd204/ad_ip_jesd204_tpl_dac
 LIB_DEPS += jesd204/axi_jesd204_tx
 LIB_DEPS += jesd204/jesd204_tx
 LIB_DEPS += sysid_rom
-LIB_DEPS += util_dacfifo
+LIB_DEPS += util_do_ram
+LIB_DEPS += util_hbm
 LIB_DEPS += util_pack/util_upack2
 LIB_DEPS += xilinx/axi_adxcvr
 LIB_DEPS += xilinx/util_adxcvr
diff --git a/projects/ad916x_fmc/zcu102/system_bd.tcl b/projects/ad916x_fmc/zcu102/system_bd.tcl
index 4e9f38aed7b..de33ba9bce6 100644
--- a/projects/ad916x_fmc/zcu102/system_bd.tcl
+++ b/projects/ad916x_fmc/zcu102/system_bd.tcl
@@ -3,11 +3,12 @@
 ### SPDX short identifier: ADIBSD
 ###############################################################################
 
-set dac_fifo_address_width 13
+## Offload attributes
+set dac_offload_type 0   ; ## BRAM
+set dac_offload_size [expr $ad_project_params(NUM_LINKS)*$ad_project_params(JESD_L)*64*1024]
 
 source $ad_hdl_dir/projects/scripts/adi_pd.tcl
 source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl
-source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl
 
 source $ad_hdl_dir/projects/dac_fmc_ebz/common/dac_fmc_ebz_bd.tcl
 
@@ -86,6 +87,7 @@ LINKS=$ad_project_params(NUM_LINKS)\
 DAC_DEVICE=$ADI_DAC_DEVICE\
 DAC_MODE=$ADI_DAC_MODE\
 ADI_LANE_RATE=$ADI_LANE_RATE\
-DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width"
+DAC_OFFLOAD:TYPE=$dac_offload_type\
+SIZE=$dac_offload_size"
 
 sysid_gen_sys_init_file $sys_cstring
diff --git a/projects/ad916x_fmc/zcu102/system_top.v b/projects/ad916x_fmc/zcu102/system_top.v
index 91c2cb67d48..62e13b42e3e 100644
--- a/projects/ad916x_fmc/zcu102/system_top.v
+++ b/projects/ad916x_fmc/zcu102/system_top.v
@@ -69,7 +69,6 @@ module system_top #(
   wire    [ 2:0]  spi1_csn;
   wire            tx_ref_clk;
   wire    [ 1:0]  tx_sync;
-  wire            dac_fifo_bypass;
 
   // spi
 
@@ -113,8 +112,6 @@ module system_top #(
       fmc_txen_0
     }));
 
-  assign dac_fifo_bypass = gpio_o[21];
-
   /* Board GPIOS. Buttons, LEDs, etc... */
   assign gpio_i[20: 8] = gpio_bd_i;
   assign gpio_bd_o = gpio_o[7:0];
@@ -125,7 +122,6 @@ module system_top #(
   system_wrapper i_system_wrapper (
     .gpio_i (gpio_i),
     .gpio_o (gpio_o),
-    .dac_fifo_bypass(dac_fifo_bypass),
     .spi0_csn (spi0_csn),
     .spi0_miso (spi_miso),
     .spi0_mosi (spi_mosi),