Merge "Fix: Update arch and flavor in helm template"