For square, I recommend these. I had these before my Pyrex and they did me well. I still use some for overflow.

Elacra Glass Food Storage Containers - 9 Glass Containers and 9 Locking Lids - Meal Prep & Lunch Glass Container Set https://www.amazon.com/dp/B075N2WYND/ref=cm_sw_r_cp_apa_e4bpBbF6JEJ9X