[WIP] Update infra type.yaml.tmpl