Merge "Update vfc yaml template"