Worklight with replaceable battery, currently using a Unilite

Hi all. For work, I have a Unilite SLR500 and also an SLR1000 which are really good - small enough to stick in a tight space, good wide spread of light and reasonable battery life.

However, on longer days where I might be using the light on high for a full day, it runs out of battery. Having to carry a second work light so I can carry on working is a pain, I'm trying to get my toolbox as light as possible!

Is there a similar size/output work light which takes replaceable 18650 etc cells? I'd love to be able to just switch out the battery mid job and get another few hours of runtime.

I have a Bosch 18v battery and Bosch LED work light which is good for larger spaces, but it's often too big to squeeze in tight gaps, and it's too heavy for magnets to hold up.