Changes for Azure Deployment