What are some herbs/supplements to drink or eat to get rid of stubborn trapped gas?

Hi, I was just wondering what I could use to get rid of stubborn trapped gas. Do I need something probiotic? What could I drink in the morning and night? I don't want to overdo it and make things worse. I'm not looking for a laxitive, just relieve gas. Diet is good, I exercise, drink water, I feel though that the way I exercise I don't let the daily fiber, or any other help to get rid of gas stay in my body because I am constantly working out every other day (like 2 hrs +) so I feel with me sweating, burning fat and body not properly recovering, I might need a herb to help. But the thing is I also get tired of drinking water only, so I would be doing a win win ya know. I love ginger and peppermint, but don't know when to drink it or how....Should I drink one only a day or two of the same (morning and night) or two of different ones? It's nothing serious, just annoying...