Fresh Water Tank Issue

Good morning,just got back from boon docking on the weekend.My water pump was cavitating and upon inspection found water pooling and running out below tank. Removed coroplast bottom and found water nipple broken off tank due to tank moving sideways in brackets.
Tank has straps underneath holding it from falling but no straps around tank to prevent from moving side to side.Has anyone else experienced this issue,not a hard fix but time consuming,a strap around tank from manufacture would prevent this issue,was able to buy tank nipple at local hardware store.Purchased an extra for backup.

I use a piece of angle iron or tubing across the frame rails under the tank. I have done this on every rig I have owned since I travel with a full tank of water.

I just discovered this same issue while I had the coroplast down. Hadn't broken the nipple yet but was trying. I cut a pair of brackets from 1" aluminum angle and bolted them on either side of the centered tank.
Cheers!