Fix for hardcoded machine name