Updated infrastructure [skip-ci]