Correct. About 50% were French regulars, about 30% Vietnamese and about 20% multinational Legionnaires, many of whom were Wehrmacht veterans.
And many of those Wehrmacht veterans were Waffen SS.