A method, apparatus, and a computer-readable storage medium for beam refinement of a two-step random access channel (RACH) procedure are provided. In some implementations, the method may include receiving a plurality of synchronization signal blocks (SSBs), a plurality of channel state information-reference signals (CSI-RSs) associated with each of the plurality of synchronization signal blocks (SSBs), and random access channel (RACH) configuration data from a gNB. The method may further include transmitting a first message of the two-step random access channel (RACH) procedure to the gNB, the first message including a first portion and a second portion. The first portion includes a preamble associated with a selected channel state information-reference signal (CSI-RS) of the plurality of channel state information-reference signals (CSI-RSs) and the second portion includes data associated with the preamble, and the data transmitted using pre-configured or pre-allocated resources.