At some point the North American Free Trade Agreement (NAFTA) might be replaced by the United States-Mexico-Canada Agreement (USMCA), although at this point we don't know if and when that will happen.
As of now, however, NAFTA is still the free trade agreement in force between the three countries. You should continue to do everything your company is currently doing to take advantage of duty-free trade under NAFTA.
But the decision to participate in NAFTA is not always a slam dunk. Because of its complexity and specificity, NAFTA can become more burdensome than it is useful for those tasked with computing whether or not their goods are eligible for preferential duty rates.