Samsung has been quite busy rolling out major Android OS upgrades to the likes of Galaxy S8, Note 8, and even the 2017 editions of Galaxy A3 and Galaxy A5. Still, the Korean tech giant has some time to take care of its older flagship phones whose Oreo update remains in the balance.

We do know that T-Mobile’s Galaxy Note 5 and Galaxy S6 Edge Plus have Android Oreo under development, however, we don’t know if this means all other markets will receive Oreo. Nonetheless, Samsung is doing everything possible to keep the devices fresh and today, a new update is available with April 2018 security patches, stability and performance improvements.

The Magenta carrier’s Galaxy Note 5 is receiving an update that installs software version N920TUVS5ERD1 while the Galaxy S6 Edge Plus is receiving software version G928TUVS5ERD1. The same update is also rolling out to Canadian variants of the pair, where it bumps up the software version to N920W8VLS5CRD2 and G928W8VLS5CRD2, respectively.

Accompanying the Galaxy Note 5 and S6 Edge Plus in receiving this month’s patches are the budget Galaxy J5 2017 and entry-level Galaxy J2 Pro, whose updates install software versions J530FXXU2ARC3 and J250YXXU1ARC7.

The updates are rolling out over the air and thus they’ll take some time before they reach all devices. If you own any of these devices, though, you can force the update by heading to Settings > Software update > Download updates manually.

It’s worth noting that on this list, there’s no device that stands a chance of receiving an update to Android P, but the Galaxy J5 2017, which came preinstalled with Nougat and is bound to receive at least one major OS upgrade in its lifetime, should be upgraded to Android Oreo later this year.