One could use the sqare bottles just for processing and other bottles for storage.
For the latter glass bottles and Nitrogen may be a good solution.