diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index f0325a2882..d6407e0a5a 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -1342,16 +1342,16 @@ int main(int argc, char *argv[])
           pusch_config_pdu->num_dmrs_cdm_grps_no_data = num_dmrs_cdm_grps_no_data;
         }
         if (uci_on_pusch) {
-          const nfapi_nr_ue_pusch_uci_t pusch_uci = {
-              .alpha_scaling = 3,
-              .beta_offset_csi1 = 13,
-              .beta_offset_csi2 = 13,
-              .beta_offset_harq_ack = 11,
-              .harq_ack_bit_length = 3,
-              .harq_payload = 3,
-              .csi_part1_bit_length = 4,
-              .csi_part1_payload = 15
-          };
+          const nfapi_nr_ue_pusch_uci_t pusch_uci = {.alpha_scaling = 3,
+                                                     .beta_offset_csi1 = 13,
+                                                     .beta_offset_csi2 = 13,
+                                                     .beta_offset_harq_ack = 11,
+                                                     .harq_ack_bit_length = 3,
+                                                     .harq_payload = 3,
+                                                     .csi_part1_bit_length = 4,
+                                                     .csi_part1_payload = 15,
+                                                     .csi_part2_bit_length = 4,
+                                                     .csi_part2_payload = 15};
           pusch_config_pdu->pusch_uci = pusch_uci;
           prepare_ue_pusch_pdu_from_matlab_vector(uci_on_pusch, uci_ulsch_matlab_vec, pusch_config_pdu, cw_buf);
         }
diff --git a/openair1/SIMULATION/TOOLS/uci_on_pusch_encode.m b/openair1/SIMULATION/TOOLS/uci_on_pusch_encode.m
index c5c27f0ca7..c2d41dcacb 100644
--- a/openair1/SIMULATION/TOOLS/uci_on_pusch_encode.m
+++ b/openair1/SIMULATION/TOOLS/uci_on_pusch_encode.m
@@ -32,7 +32,7 @@ pusch.DMRS.SequenceHopping = 0;
 
 pusch.BetaOffsetACK = 20;
 pusch.BetaOffsetCSI1 = 6.25;
-pusch.BetaOffsetCSI2 = 1;
+pusch.BetaOffsetCSI2 = 6.25;
 pusch.UCIScaling = 1;
 
 A = 37896;
@@ -43,7 +43,7 @@ nlayers = pusch.NumLayers; % Number of layers for decoding
 
 oack = 3;
 ocsi1 = 4;
-ocsi2 = 0;
+ocsi2 = 4;
 cbsInfo = nrULSCHInfo(pusch, rate, A, oack, ocsi1, ocsi2); % Get ULSCH information
 
 ack = randi([0 1],oack,1);
@@ -51,7 +51,7 @@ csi1 = randi([0 1],ocsi1,1);
 csi2 = randi([0 1],ocsi2,1);
 cack = nrUCIEncode(ack,cbsInfo.GACK,pusch.Modulation);
 ccsi1 = nrUCIEncode(csi1,cbsInfo.GCSI1,pusch.Modulation);
-ccsi2 = [];
+ccsi2 = nrUCIEncode(csi2,cbsInfo.GCSI2,pusch.Modulation);
 
 tb_data = randi([0 1],A,1);
 % Transport block CRC attachment