Align to latest infrastructure version