Updated infrastructure

Signed-off-by: Anders Bech Mellson <mellson@icloud.com>