Transport Minister Prajin Juntong has set Sunday as the deadline for completing the action plan to solve aviation safety concerns.
He vowed to finish restructuring the failing Department of Civil Aviation (DCA) later this month.
The time frames were announced Thursday as Thailand races to submit new aviation regulations - named the Corrective Action Plan - to the International Civil Aviation Organisation (ICAO).
The ICAO will examine the DCA's approaches to inadequate management and announce the results on June 18.
The DCA, which plays a key role in regulating aviation businesses and granting Air Operators' Certificates, has failed to meet aviation safety standards, according to the ICAO's latest audit of the department's performance in January.
Japanese and Korean aviation agencies banned some Thai-registered airlines as a result of the ICAO's findings.
The government says it has made significant progress in ridding the DCA of problems. ACM Prajin said the Corrective Action Plan, which emphasises two key safety issues, will be completed by Sunday, while the DCA restructuring plan will be finished a bit later and sent to Prime Minister Prayut Chan-o-cha on May 22.
The two safety concerns are considered urgent.
The first is the lack of qualified and experienced personnel able to grant Air Operators' Certificates when inspecting aircraft, pilots and airlines.
The second is the inadequate regulations on transportation of hazardous materials, such as batteries, engines and flammable substances.
In its immediate response to the problems, the DCA drafted manuals aimed at helping its staff keep their inspections and regulations in line with ICAO standards.
The department also plans to hold training courses for staff to equip themselves with the most up-to-date knowledge amid expansions in the aviation business.
Singaporean experts will conduct a two-week training course for Thai airlines, focusing on the process of granting Air Operators' Certificates, ACM Prajin said earlier.
As for the overhaul of the DCA's management, the Transport Ministry plans to divide its responsibilities into three parts - aviation regulation, rescue operations and airport supervision, the minister said. The restructuring can take effect as soon as Gen Prayut approves it, he added.
"We plan to ask the premier to invoke Section 44 to speed up the procedure," ACM Prajin said, referring to a law under the interim charter which allows the prime minister to exercise legislative, administrative and judicial powers for the interest of national security.
About two weeks after Gen Prayut's approval of the new management structure, the three new agencies will begin to take shape.
Office and personnel relocation will take about three to four months, ACM Prajin added.
