CI storage optimization - Phase 1: prep-work