diff --git a/_data/devices/deadpool.yml b/_data/devices/deadpool.yml
index 26a309ea60..336b84448c 100644
--- a/_data/devices/deadpool.yml
+++ b/_data/devices/deadpool.yml
@@ -8,7 +8,7 @@ codename: deadpool
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.8 GHz
-current_branch: 20
+current_branch: 21
 custom_unlock_cmd: 'fastboot flashing unlock'
 dimensions: {depth: 15, height: 69, width: 69}
 download_boot: 'adb reboot recovery'
@@ -31,5 +31,5 @@ tree: android_device_askey_deadpool
 type: Set top box
 vendor: Google
 vendor_short: askey
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/dopinder.yml b/_data/devices/dopinder.yml
index 526c50480e..344cf43c3a 100644
--- a/_data/devices/dopinder.yml
+++ b/_data/devices/dopinder.yml
@@ -8,7 +8,7 @@ codename: dopinder
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.8 GHz
-current_branch: 20
+current_branch: 21
 custom_unlock_cmd: "fastboot oem 'setenv lock 10100000;saveenv;save' && fastboot reboot bootloader && fastboot flashing unlock"
 dimensions: {depth: 15, height: 69, width: 69}
 download_boot: Run `adb reboot bootloader`.
@@ -32,5 +32,5 @@ tree: android_device_askey_dopinder
 type: Set top box
 vendor: Walmart
 vendor_short: askey
-versions: [20]
+versions: [20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/m5.yml b/_data/devices/m5.yml
index 0794c53f4c..a863b357e3 100644
--- a/_data/devices/m5.yml
+++ b/_data/devices/m5.yml
@@ -6,7 +6,7 @@ codename: m5
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.8 GHz
-current_branch: 20
+current_branch: 21
 custom_unlock_cmd: 'fastboot flashing unlock'
 dimensions: {depth: 17, height: 56, width: 85}
 download_boot: Press and hold the `SW4` button on the board, and plug into your PC.
@@ -30,5 +30,5 @@ tree: android_device_bananapi_m5
 type: Devkit
 vendor: Banana Pi
 vendor_short: amlogic
-versions: [20]
+versions: [20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/odroidc4.yml b/_data/devices/odroidc4.yml
index dd07e0d75b..ef319770f8 100644
--- a/_data/devices/odroidc4.yml
+++ b/_data/devices/odroidc4.yml
@@ -6,7 +6,7 @@ codename: odroidc4
 cpu: Cortex-A55
 cpu_cores: '4'
 cpu_freq: 2.016 GHz
-current_branch: 20
+current_branch: 21
 custom_unlock_cmd: 'fastboot flashing unlock'
 dimensions: {depth: 10, height: 56, width: 85}
 download_boot: Attach a blank eMMC module to the device, and plug into your PC.
@@ -30,5 +30,5 @@ tree: android_device_hardkernel_odroidc4
 type: Devkit
 vendor: HardKernel
 vendor_short: amlogic
-versions: [20]
+versions: [20, 21]
 wifi: None
diff --git a/_data/devices/radxa0.yml b/_data/devices/radxa0.yml
index 6ea5344d39..f91499e42b 100644
--- a/_data/devices/radxa0.yml
+++ b/_data/devices/radxa0.yml
@@ -6,7 +6,7 @@ codename: radxa0
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.8 GHz
-current_branch: 20
+current_branch: 21
 custom_unlock_cmd: 'fastboot flashing unlock'
 dimensions: {depth: 5, height: 30, width: 65}
 download_boot: Press and hold the `USB BOOT` button on the board, and plug into your PC.
@@ -30,5 +30,5 @@ tree: android_device_radxa_radxa0
 type: Devkit
 vendor: Radxa
 vendor_short: amlogic
-versions: [20]
+versions: [20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/wade.yml b/_data/devices/wade.yml
index 213d4937d4..846c5d683d 100644
--- a/_data/devices/wade.yml
+++ b/_data/devices/wade.yml
@@ -8,7 +8,7 @@ codename: wade
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.8 GHz
-current_branch: 20
+current_branch: 21
 custom_unlock_cmd: "fastboot oem 'setenv lock 10100000;saveenv;save' && fastboot reboot bootloader && fastboot flashing unlock"
 dimensions: {depth: 15, height: 69, width: 69}
 download_boot: Run `adb reboot bootloader`.
@@ -32,5 +32,5 @@ tree: android_device_askey_wade
 type: Set top box
 vendor: Dynalink
 vendor_short: askey
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac