What battery are you using? In am my Milwaukee stuff I use the xc6.0 batteries for the m18 and the xc5.0 in the m12. They last a long time and produce the most power.
I have heard the new forge batteries are even better but I personally don’t have a need for one at work. Maybe give the forge...