Crystal and oscillators for custom ATMEGA328P, is load capacitance needed?
Unless I had a specific reason for diverging from what Atmel/Microchip says, I'd follow the design recommendations in their COMPLETE datasheet (not the one you linked).  They show:

The complete datasheet is here: ATMEGA328P Datasheet
The image above is from page 26.