diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt
index b45b0fc68d..8dd5052714 100644
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -95,6 +95,10 @@ ID = GNB_PHY_DL_TICK
     DESC = gNodeB downlink tick - one tick per slot at start of downlink processing
     GROUP = ALL:PHY:GRAPHIC:GNB
     FORMAT = int,gNB_ID : int,frame : int,slot
+ID = GNB_PHY_UL_TICK
+    DESC = gNodeB uplink tick - one tick per slot at start of uplink processing
+    GROUP = ALL:PHY:GRAPHIC:GNB
+    FORMAT = int,gNB_ID : int,frame : int,slot
 ID = ENB_PHY_MIB
     DESC = MIB data
     GROUP = ALL:PHY:ENB:WIRESHARK
@@ -221,6 +225,22 @@ ID = NRUE_MAC_DL_RAR_PDU_WITH_DATA
     DESC = NR MAC downlink PDU for RAR
     GROUP = ALL:MAC:UE:WIRESHARK
     FORMAT = int,rnti : int,frame : int,slot : buffer,data
+ID = GNB_MAC_DL
+    DESC = NR MAC downlink scheduler decision for an UE
+    GROUP = ALL:MAC:GNB
+    FORMAT = int,rnti : int,frame : int,slot : int,mcs : int,tbs
+ID = GNB_MAC_LCID_DL
+    DESC = NR MAC downlink scheduler decision for an UE for a specific LCID
+    GROUP = ALL:MAC:GNB
+    FORMAT = int,rnti : int,frame : int,slot : int,lcid : int,data_size : int,tx_list_occupancy
+ID = GNB_MAC_UL
+    DESC = NR MAC uplink scheduler decision for an UE
+    GROUP = ALL:MAC:GNB
+    FORMAT = int,rnti : int,frame : int,slot : int,mcs : int,tbs
+ID = GNB_MAC_LCID_UL
+    DESC = NR MAC uplink traffic received for an UE for a specific LCID
+    GROUP = ALL:MAC:GNB
+    FORMAT = int,rnti : int,frame : int,slot : int,lcid : int,data_size
 
 #RLC logs
 ID = ENB_RLC_DL
diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 345b58df7e..5ba70dc32b 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -174,6 +174,8 @@ static void rx_func(processingData_L1_t *info)
   int slot_rx = info->slot_rx;
   nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
 
+  T(T_GNB_PHY_UL_TICK, T_INT(gNB->Mod_id), T_INT(frame_rx), T_INT(slot_rx));
+
   // RX processing
   int rx_slot_type = nr_slot_select(cfg, frame_rx, slot_rx);
   if (rx_slot_type == NR_UPLINK_SLOT || rx_slot_type == NR_MIXED_SLOT) {
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index 44d4affb08..c47b8ceb33 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -1307,6 +1307,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
             if (len == 0)
               break;
 
+            T(T_GNB_MAC_LCID_DL, T_INT(rnti), T_INT(frame), T_INT(slot), T_INT(lcid), T_INT(len * 8), T_INT(nr_rlc_tx_list_occupancy(rnti, lcid)));
             header->R = 0;
             header->F = 1;
             header->LCID = lcid;
@@ -1380,6 +1381,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
 
       T(T_GNB_MAC_DL_PDU_WITH_DATA, T_INT(module_id), T_INT(CC_id), T_INT(rnti),
         T_INT(frame), T_INT(slot), T_INT(current_harq_pid), T_BUFFER(harq->transportBlock.buf, TBS));
+      T(T_GNB_MAC_DL, T_INT(rnti), T_INT(frame), T_INT(slot), T_INT(sched_pdsch->mcs), T_INT(TBS));
     }
 
     const int ntx_req = TX_req->Number_of_PDUs;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 4486be536d..c177a791b9 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -485,6 +485,7 @@ static int nr_process_mac_pdu(instance_t module_idP,
           UE->mac_stats.ul.total_sdu_bytes += mac_len;
           UE->mac_stats.ul.lc_bytes[lcid] += mac_len;
         }
+        T(T_GNB_MAC_LCID_UL, T_INT(UE->rnti), T_INT(frameP), T_INT(slot), T_INT(lcid), T_INT(mac_len * 8));
         break;
 
       case UL_SCH_LCID_DTCH ...(UL_SCH_LCID_DTCH + 28):
@@ -512,6 +513,7 @@ static int nr_process_mac_pdu(instance_t module_idP,
           else
             sched_ctrl->estimated_ul_buffer = 0;
         }
+        T(T_GNB_MAC_LCID_UL, T_INT(UE->rnti), T_INT(frameP), T_INT(slot), T_INT(lcid), T_INT(mac_len * 8));
         break;
 
       case UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY:
@@ -2467,6 +2469,8 @@ void post_process_ulsch(gNB_MAC_INST *nr_mac, post_process_pusch_t *pusch, NR_UE
         sched_ctrl->estimated_ul_buffer - sched_ctrl->sched_ul_bytes,
         sched_ctrl->tpc0);
 
+  T(T_GNB_MAC_UL, T_INT(UE->rnti), T_INT(frame), T_INT(slot), T_INT(sched_pusch->mcs), T_INT(sched_pusch->tb_size));
+
   /* PUSCH in a later slot, but corresponding DCI now! */
   const int index = ul_buffer_index(sched_pusch->frame,
                                     sched_pusch->slot,