Align with Azure best practices