Update for storage selection on s2