Updates to Debian and Ubuntu templates