Fixing infra script to generate all the necessary files