Merge "Chore: Fix image volume sizes and image flavors"