The amendments to the country's anti-doping law should be enacted by February, Sports Authority of Thailand (SAT) governor Gongsak Yodmani said on Wednesday.
If the process is finalised, it will end the ban imposed by the World Anti-Doping Agency (Wada), Gongsak told a press conference.
Thailand was declared non-compliant by Wada in October after failing to fully implement its 2021 anti-doping code and barred from hosting international tournaments.
Thai athletes are still allowed to compete in international tournaments but the national flag will not be flown at such events, excluding the Olympics and Paralympics.
As a result, the Badminton Association of Thailand flag was raised instead of the Thai national flag during the award presentation ceremony after mixed doubles stars Dechapol Puavaranukroh and Sapsiree Taerattanachai won the title at the BWF World Championships in Spain on Sunday.
"It's a pity but at least we won," Sapsiree said.
It caused an uproar from Thai fans who labelled it as a shame while critics and opposition politicians called on the government to act quickly.
Gongsak said the draft amendments will be considered by the cabinet next Tuesday.
If the amendments are enacted by the government as an executive decree, they could become effective as early as next month, he said.
However, if the amendments are issued as a legislative bill, it will have to go through parliamentary procedures and could become law by February, according to Gongsak.
The Council of State, the government's legal advisory body, has finished scrutiny of the draft amendments, prepared by the Tourism and Sports Ministry, the SAT and the National Olympic Committee of Thailand.
Gongsak said Wada has seen the draft amendments and is pleased with them.
"We have been informed by Wada that the draft amendments are completely in line with its anti-doping rules," he said.
Gongsak said when the amendments become law, he will forward the matter to Wada as soon as possible so that Thailand will be dropped from its list of suspended countries.