Merge "[HELM] Fix helm 3.6 packer job"