Self-storage is a booming industry. Both private customers and companies can rent temporary space from such facilities. The design of self-storage warehouses differs from other facility designs in its focus on revenue maximization. A major question is how to design self-storage facilities to fit market segments and accommodate volatile demand to maximize revenue. Customers that cannot be accommodated with a space size of their choice can be either rejected or upscaled to a larger space. Based on data of 54 warehouses in America, Europe, and Asia, we propose a new facility design approach with models for three different cases: an overflow customer rejection model and two models with customer upscale possibilities, one with reservation and another without reservation. We solve the models for several real warehouse cases, and our results show that the existing self-storage warehouses can be redesigned to generate larger revenues for all cases. Finally, we show that the upscaling policy without reservation generally outperforms the upscaling policy with reservation.