Removed hardcoded env references in some templates