Changing hardcoded username to ${USER}