OnePlus has made a decision to put software at the forefront of its efforts with its smartphones, and, as a result, has outlined how it plans on improving the update process for its devices out in the wild.

The manufacturer’s new Software Maintenance Schedule outlines that the company plans on offering two years’ worth of software updates for its smartphones beginning immediately, and that the handsets will also be subject to receive three years’ worth of security maintenance patches. Those are based on the release dates for the phones in question.

The OnePlus 3/3T is already on the cusp of reaching the end of its software updates, however, OnePlus is making good for owners out there in the wild:

“We will be publishing the last Open Beta build for OnePlus 3/3T later this week, and at the beginning of July, we will provide a stable version of OnePlus 3/3T for beta testers to migrate back to the stable version of OxygenOS.”

The OnePlus 5/5T still has a year to go with its software updates, and two years for its security updates. And finally, the OnePlus 6 still has its full two years of software updates to look forward to, and three years for security patches. Those security patches will be issued every two months.

OnePlus confirmed in its public forum post that the new Software Maintenance Schedule is in effect beginning immediately, so if you picked up a OnePlus 6 at launch, there is a lot to look forward to moving forward in terms of software updates.