...so that we can stop assuming the username inside the container (although the shortcut generation script still does, but we'll fix that later, hopefully)