Fix deploy issues with multiple hosts