Port to new iaas config