diff --git a/common/openairinterface5g_limits.h b/common/openairinterface5g_limits.h
index ad36fae476..f5d9c21ad5 100644
--- a/common/openairinterface5g_limits.h
+++ b/common/openairinterface5g_limits.h
@@ -11,10 +11,7 @@
 #        define NUMBER_OF_SRS_MAX 16
 #        define NUMBER_OF_NR_ULSCH_MAX 8
 #        define NUMBER_OF_NR_DLSCH_MAX 8
-#        define NUMBER_OF_NR_UCI_MAX 16
-#        define NUMBER_OF_NR_SRS_MAX 16
 #        define NUMBER_OF_SCH_STATS_MAX 16
-
 #        define NUMBER_OF_NR_SCH_STATS_MAX 16
 
 #        define NUMBER_OF_NR_PDCCH_MAX 16
diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 515950c15e..859994e1a5 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -607,14 +607,6 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB)
   //PRS init
   nr_init_prs(gNB);
 
-  for (int id=0; id<NUMBER_OF_NR_SRS_MAX; id++) {
-    gNB->nr_srs_info[id] = (nr_srs_info_t *)malloc16_clear(sizeof(nr_srs_info_t));
-    gNB->nr_srs_info[id]->srs_generated_signal = (int32_t**)malloc16_clear(MAX_NUM_NR_SRS_AP*sizeof(int32_t*));
-    for(int ap=0; ap<MAX_NUM_NR_SRS_AP; ap++) {
-      gNB->nr_srs_info[id]->srs_generated_signal[ap] = (int32_t*)malloc16_clear(fp->ofdm_symbol_size*MAX_NUM_NR_SRS_SYMBOLS*sizeof(int32_t));
-    }
-  }
-
   generate_ul_reference_signal_sequences(SHRT_MAX);
 
   /* Generate low PAPR type 1 sequences for PUSCH DMRS, these are used if transform precoding is enabled.  */
@@ -623,6 +615,15 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB)
   /// Transport init necessary for NR synchro
   init_nr_transport(gNB);
 
+  gNB->nr_srs_info = (nr_srs_info_t **)malloc16_clear(gNB->max_nb_srs * sizeof(nr_srs_info_t*));
+  for (int id = 0; id < gNB->max_nb_srs; id++) {
+    gNB->nr_srs_info[id] = (nr_srs_info_t *)malloc16_clear(sizeof(nr_srs_info_t));
+    gNB->nr_srs_info[id]->srs_generated_signal = (int32_t**)malloc16_clear(MAX_NUM_NR_SRS_AP*sizeof(int32_t*));
+    for(int ap=0; ap<MAX_NUM_NR_SRS_AP; ap++) {
+      gNB->nr_srs_info[id]->srs_generated_signal[ap] = (int32_t*)malloc16_clear(fp->ofdm_symbol_size*MAX_NUM_NR_SRS_SYMBOLS*sizeof(int32_t));
+    }
+  }
+
   common_vars->txdataF = (int32_t **)malloc16(Ptx*sizeof(int32_t*));
   common_vars->rxdataF = (int32_t **)malloc16(Prx*sizeof(int32_t*));
   /* Do NOT allocate per-antenna txdataF/rxdataF: the gNB gets a pointer to the
@@ -760,7 +761,7 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
   free_and_zero(nr_gold_csi_rs);
   free_and_zero(gNB->nr_csi_info);
 
-  for (int id = 0; id < NUMBER_OF_NR_SRS_MAX; id++) {
+  for (int id = 0; id < gNB->max_nb_srs; id++) {
     for(int i=0; i<MAX_NUM_NR_SRS_AP; i++) {
       free_and_zero(gNB->nr_srs_info[id]->srs_generated_signal[i]);
     }
@@ -1026,13 +1027,14 @@ void init_nr_transport(PHY_VARS_gNB *gNB)
   else
     nb_ul_slots_period = fp->slots_per_frame;
 
-  int pucch_slots;
+  int buffer_ul_slots; // the UL channels are scheduled sl_ahead before they are transmitted
   if (gNB->if_inst->sl_ahead > nb_slots_per_period)
-    pucch_slots = nb_ul_slots_period + (gNB->if_inst->sl_ahead - nb_slots_per_period);
+    buffer_ul_slots = nb_ul_slots_period + (gNB->if_inst->sl_ahead - nb_slots_per_period);
   else
-    pucch_slots = (nb_ul_slots_period < gNB->if_inst->sl_ahead) ? nb_ul_slots_period : gNB->if_inst->sl_ahead;
+    buffer_ul_slots = (nb_ul_slots_period < gNB->if_inst->sl_ahead) ? nb_ul_slots_period : gNB->if_inst->sl_ahead;
 
-  gNB->max_nb_pucch = MAX_MOBILES_PER_GNB * pucch_slots;
+  gNB->max_nb_pucch = MAX_MOBILES_PER_GNB * buffer_ul_slots;
+  gNB->max_nb_srs = buffer_ul_slots << 1; // assuming at most 2 SRS per slot
 
   gNB->pucch = (NR_gNB_PUCCH_t **) malloc16(gNB->max_nb_pucch * sizeof(NR_gNB_PUCCH_t*));
   for (int i = 0; i < gNB->max_nb_pucch; i++) {
@@ -1041,8 +1043,9 @@ void init_nr_transport(PHY_VARS_gNB *gNB)
     AssertFatal(gNB->pucch[i] != NULL,"Can't initialize pucch %d \n", i);
   }
 
-  for (int i=0; i<NUMBER_OF_NR_SRS_MAX; i++) {
-    LOG_I(PHY,"Allocating Transport Channel Buffers for SRS %d/%d\n",i,NUMBER_OF_NR_SRS_MAX);
+  gNB->srs = (NR_gNB_SRS_t **) malloc16(gNB->max_nb_srs * sizeof(NR_gNB_SRS_t*));
+  for (int i = 0; i < gNB->max_nb_srs; i++) {
+    LOG_I(PHY,"Allocating Transport Channel Buffers for SRS %d/%d\n", i, gNB->max_nb_srs);
     gNB->srs[i] = new_gNB_srs();
     AssertFatal(gNB->srs[i]!=NULL,"Can't initialize srs %d \n", i);
   }
@@ -1071,7 +1074,7 @@ void reset_nr_transport(PHY_VARS_gNB *gNB)
   for (int i = 0; i < gNB->max_nb_pucch; i++)
     free_gNB_pucch(gNB->pucch[i]);
 
-  for (int i = 0; i < NUMBER_OF_NR_SRS_MAX; i++)
+  for (int i = 0; i < gNB->max_nb_srs; i++)
     free_gNB_srs(gNB->srs[i]);
 
   for (int i=0; i<gNB->number_of_nr_ulsch_max; i++)
diff --git a/openair1/PHY/NR_TRANSPORT/srs_rx.c b/openair1/PHY/NR_TRANSPORT/srs_rx.c
index 5d855ae6b5..7c0e241af8 100644
--- a/openair1/PHY/NR_TRANSPORT/srs_rx.c
+++ b/openair1/PHY/NR_TRANSPORT/srs_rx.c
@@ -64,7 +64,7 @@ int nr_find_srs(rnti_t rnti,
   AssertFatal(gNB!=NULL,"gNB is null\n");
   int index = -1;
 
-  for (int i=0; i<NUMBER_OF_NR_SRS_MAX; i++) {
+  for (int i = 0; i < gNB->max_nb_srs; i++) {
     AssertFatal(gNB->srs[i]!=NULL,"gNB->srs[%d] is null\n",i);
     if ((gNB->srs[i]->active>0) &&
         (gNB->srs[i]->srs_pdu.rnti==rnti) &&
@@ -85,8 +85,8 @@ void nr_fill_srs(PHY_VARS_gNB *gNB,
                  nfapi_nr_srs_pdu_t *srs_pdu) {
 
   int id = nr_find_srs(srs_pdu->rnti,frame,slot,gNB);
-  AssertFatal( (id>=0) && (id<NUMBER_OF_NR_SRS_MAX),
-               "invalid id found for srs !!! rnti %04x id %d\n",srs_pdu->rnti,id);
+  AssertFatal((id >= 0) && (id < gNB->max_nb_srs),
+              "invalid id found for srs !!! rnti %04x id %d\n",srs_pdu->rnti,id);
 
   NR_gNB_SRS_t  *srs = gNB->srs[id];
   srs->frame = frame;
diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index b21f3c1192..739eddc052 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -618,13 +618,14 @@ typedef struct PHY_VARS_gNB_s {
   nfapi_nr_uci_indication_t uci_indication;
   
   int max_nb_pucch;
+  int max_nb_srs;
   NR_gNB_PBCH        pbch;
   NR_gNB_COMMON      common_vars;
   NR_gNB_PRACH       prach_vars;
   NR_gNB_PRS         prs_vars;
   NR_gNB_PUSCH       *pusch_vars[NUMBER_OF_NR_ULSCH_MAX];
   NR_gNB_PUCCH_t     **pucch;
-  NR_gNB_SRS_t       *srs[NUMBER_OF_NR_SRS_MAX];
+  NR_gNB_SRS_t       **srs;
   NR_gNB_PDCCH_t     pdcch_pdu[NUMBER_OF_NR_PDCCH_MAX];
   NR_gNB_UL_PDCCH_t  ul_pdcch_pdu[NUMBER_OF_NR_PDCCH_MAX];
   NR_gNB_DLSCH_t     *dlsch[NUMBER_OF_NR_DLSCH_MAX][2];    // Nusers times two spatial streams
@@ -637,7 +638,7 @@ typedef struct PHY_VARS_gNB_s {
   t_nrPolar_params    **polarParams;
 
   /// SRS variables
-  nr_srs_info_t *nr_srs_info[NUMBER_OF_NR_SRS_MAX];
+  nr_srs_info_t **nr_srs_info;
 
   /// CSI variables
   nr_csi_info_t *nr_csi_info;
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index bed81d2f7c..78f75b9e51 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -582,7 +582,7 @@ void fill_ul_rb_mask(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
     }
   }
 
-  for (int i=0;i<NUMBER_OF_NR_SRS_MAX;i++) {
+  for (int i = 0; i < gNB->max_nb_srs; i++) {
     NR_gNB_SRS_t *srs = gNB->srs[i];
     if (srs) {
       if ((srs->active == 1) && (srs->frame == frame_rx) && (srs->slot == slot_rx)) {
@@ -870,7 +870,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
     }
   }
 
-  for (int i = 0; i < NUMBER_OF_NR_SRS_MAX; i++) {
+  for (int i = 0; i < gNB->max_nb_srs; i++) {
     NR_gNB_SRS_t *srs = gNB->srs[i];
     if (srs) {
       if ((srs->active == 1) && (srs->frame == frame_rx) && (srs->slot == slot_rx)) {