What works for me at the moment is a bottle holder between the handlebar and stem https://www.amazon.com/Rhinowalk-Bicycle-Handlebar-Professional-Accessories/dp/B097HF5MRL and a bottle cage https://www.amazon.com/Nopal-CC2-Anything-Bikepacking-Stainless/dp/B09FCT2VXV with some Velcro straps.