Align infrastructure