First set of fixes to scripts and configurations for scenario 1