CFY-1232 make storage class configurable