Embodiments of a User Equipment (UE), Next Generation Node-B (gNB) and methods of communication are generally described herein. A channel state information (CSI) report may include a CSI part 1 transmission and may be configurable to include a CSI part 2 transmission. The UE may determine a first number of coded modulation symbols per layer to be used for the CSI part 1 transmission on a physical uplink shared channel (PUSCH) without uplink shared channel (UL-SCH) data. The first number of coded modulation symbols per layer may be determined as: a minimum of a first term and a second term if the CSI report includes the CSI part 2 transmission; and the second term if the CSI report does not include the CSI part 2 transmission.