If you work with a database and are asked to alter the table structure to comply in advance for citizenship or gender categorizations it's really important to NOT do it.
"The governor is concerned about all this stuff they want us to update our record keeping so we store both gender AND biological sex."
"We need fields to store the country of origin of people's parents."
If you don't have the power to rebuff this yourself, ask for help. At minimum ask for help online anonymously.