Night time gas, HELP!

A

My little one has such bad gas in the middle of the night, every night. She'll go to sleep fine but be up within a couple hours with bad gas pains and will not go back down. Right now before bed we do a warm bath, tummy massage, give her gas drops and gripe water, feed her, burp halfway through and at the end. She is breastfed and I am completely dairy free. I'm just not sure what else to do, any tips?! Thanks!