Finally Fixed issues for built to Azure