20 hour layover in Beijing

I'm flying from the US to Thailand and will have a 20-hour layover in Beijing.
I will also have a 6-hour layover on my way back.
Can I use the 72-hour visa for this? Or will I need to apply for the L type you mentioned in this post?

I'll be staying the night in Beijing.
Thanks!
Shelby