Best/easiest way to prevent or get rid of ingrown hairs?

I wax to remove my body hair and I’ve noticed that I have a lot of ingrown hairs on my bikini line, does anyone have any tips or tricks for preventing/getting rid of them? I’ve heard a lot about cypress and fir oil but if anyone has any further information or advice it would be greatly appreciated.