On September 1960, the squadron was transferred back to Ota, and with the disbandment of the 20 and 21 Squadrons, the entire F-84G fleet was also assigned to EICPAC. This resulted in the squadron being organized in two independent Flights, having only the command of the squadron as common between them. The T-33 Flight continued with the mission of complementary instruction while the F-84 Flight had as mission the operational conversion of pilots for the North American F-86F Sabre. However, with the beginning of the conflict in Africa, the F-84 were transferred to new squadrons in the colonies, along with many of its pilot-instructors.