Maybe also avoiding running scripts as root would be good?

Change-Id: I54b5a368f39a7cac202ea7065fc048a0ad1a81ee