diff --git a/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd b/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd
index 645d6a7f8adbdb424310ea2c0cbb9b4f55d34167..cc3f5d92d6a5414720fb651155250dc667929f99 100644
--- a/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd
+++ b/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd
@@ -713,9 +713,9 @@ BEGIN
   GENERIC MAP (
     g_use_usr_input      => TRUE,
     g_use_bg             => TRUE,
-    g_nof_streams        => 4,
+    g_nof_streams        => g_bf.nof_bf_units,            -- 4
     g_use_bg_buffer_ram  => FALSE,
-    g_buf_dat_w          => 16,
+    g_buf_dat_w          => c_transport_w*c_nof_complex, -- 16b (complex, 2*8b)
     g_buf_addr_w         => ceil_log2(c_bg_block_size),
     g_diag_block_gen_rst => c_bg_ctrl,
     g_usr_bypass_xonoff  => TRUE