For gender we keep it pretty simple
"How do you identify?
Male, Female, Nonbinary, Other, Prefer not to answer"
And for race I have switched over to the new categories from US Census Bureau
"Are you of Hispanic/Latino/Spanish origin or descent? Y/N"
"Please check all of the races you identify with.
Disclosure - we acknowledge that describing your race is complicated for many people. We are following the race question from the 2020 US Census. We are hopeful that this will be more inclusive than how we have asked about race in the past and sincerely apologize if you still feel misrepresented by this question.
White - for example, German, Irish, Lebanese, Egyptian, etc.
Black or African American - for example, African American, Jamaican, Haitian, Nigerian, Ethiopian, Somali, etc.
American Indian or Alaska Native - for example, Navajo Nation, Blackfeet Tribe, Mayan, Aztec, Native Village of Barrow Inupiat Traditional Government, Nome Eskimo Community, etc.
Chinese
Filipino
Vietnamese
Korean
Japanese
Native Hawaiian
Somoan
Chamorro
Asian Indian
Other Asian - for example, Pakistani, Cambodian, Hmong, etc.
Other Pacific Islander - for example, Tongan, Fijian, Marshallese, etc.
Some other race (please describe:)"

I communicated with Ben Granger from Qualtrics yesterday and they are in the process of updating the gender question. We are getting ready to add those two questions to our survey, so I went right to him for help. I am currently waiting for a reply from the team that is revising that question and also more information on the race question.