Fix alignment
Using container-based infrastructure