Remove use of uid=1000 in favour of $SUDO_USER globally