Small-scale geological heterogeneities in storage formations can lead to greater CO2 trapping during the capillary- and buoyancy-dominated regime. This increase in trapped saturation is called capillary heterogeneity trapping, also known as local capillary trapping. This study uses both laboratory experiments and field-scale simulations to investigate the impact of small-scale heterogeneity on field-scale CO2 migration and trapping. We conducted experiments using a meter-scale slab chamber with ripple deposits of varying grain size contrasts and incorporated these sand tank results as inputs into field-scale simulations using CMG. Experimental results indicate that CO2 trapping amount is highly dependent on both the type and the degree of small-scale heterogeneity, and even slight changes in the ripple bedform patterns can significantly alter the size and saturation of the trapped plume. Accurately capturing the effects of these heterogeneities is essential for reliable field-scale CO2 storage simulations. Capillary heterogeneity trapping can be modeled using the parameter known as the critical CO2 saturation, which represents the first nonzero value on the CO2 drainage relative permeability curve. We conducted simulations with varying critical saturation values (0.1 to 0.4) to study its impact on CO2 plume dynamics. This value range was selected based on laboratory saturation results. Simulation results show that as critical saturation increases, both the plume size and lateral extent greatly decrease. Finally, critical CO2 saturation also impacts the relative contribution from capillary and dissolution trapping. These results highlight the significant role small-scale heterogeneity plays in CO2 migration and trapping, offering insights for improving storage simulations.