Use env variable instead of hardcoded software
Fix PATHs