Sounds like storage is essential.

I have a manual bucket system atm but am planning on getting a pump.

I've got a lot of work ahead of me getting my water system sorted properly!