diff --git a/_data/devices/kiev_variant1.yml b/_data/devices/kiev_variant1.yml
index b875550e50..0bf4415935 100644
--- a/_data/devices/kiev_variant1.yml
+++ b/_data/devices/kiev_variant1.yml
@@ -11,7 +11,7 @@ codename: kiev
 cpu: Kryo 570
 cpu_cores: '8'
 cpu_freq: 2 x 2.2 GHz + 6 x 1.8 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 9.9, height: 166.1, width: 76.1}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Qualcomm Adreno 619
@@ -38,5 +38,5 @@ type: phone
 variant: 1
 vendor: Motorola
 vendor_short: motorola
-versions: [18.1, 19.1, 20]
+versions: [18.1, 19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/kiev_variant2.yml b/_data/devices/kiev_variant2.yml
index 63a017e56c..97871d78bc 100644
--- a/_data/devices/kiev_variant2.yml
+++ b/_data/devices/kiev_variant2.yml
@@ -11,7 +11,7 @@ codename: kiev
 cpu: Kryo 570
 cpu_cores: '8'
 cpu_freq: 2 x 2.2 GHz + 6 x 1.8 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 9.9, height: 166.1, width: 76.1}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Qualcomm Adreno 619
@@ -38,5 +38,5 @@ type: phone
 variant: 2
 vendor: Motorola
 vendor_short: motorola
-versions: [18.1, 19.1, 20]
+versions: [18.1, 19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nairo_variant1.yml b/_data/devices/nairo_variant1.yml
index f11334f840..3083b73f8f 100644
--- a/_data/devices/nairo_variant1.yml
+++ b/_data/devices/nairo_variant1.yml
@@ -12,7 +12,7 @@ codename: nairo
 cpu: Kryo 475
 cpu_cores: '8'
 cpu_freq: 1 x 2.4 GHz + 1 x 2.2 GHz + 6 x 1.8 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 9.7, height: 168.3, width: 74}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Qualcomm Adreno 620
@@ -39,5 +39,5 @@ type: phone
 variant: 1
 vendor: Motorola
 vendor_short: motorola
-versions: [18.1, 19.1, 20]
+versions: [18.1, 19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nairo_variant2.yml b/_data/devices/nairo_variant2.yml
index abc7585cc1..f960f17c90 100644
--- a/_data/devices/nairo_variant2.yml
+++ b/_data/devices/nairo_variant2.yml
@@ -12,7 +12,7 @@ codename: nairo
 cpu: Kryo 475
 cpu_cores: '8'
 cpu_freq: 1 x 2.4 GHz + 1 x 2.2 GHz + 6 x 1.8 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 9.7, height: 168.3, width: 74}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Qualcomm Adreno 620
@@ -39,5 +39,5 @@ type: phone
 variant: 2
 vendor: Motorola
 vendor_short: motorola
-versions: [18.1, 19.1, 20]
+versions: [18.1, 19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/racer.yml b/_data/devices/racer.yml
index 6b83d32f0c..78d5d591f7 100644
--- a/_data/devices/racer.yml
+++ b/_data/devices/racer.yml
@@ -12,7 +12,7 @@ codename: racer
 cpu: Kryo 475
 cpu_cores: '8'
 cpu_freq: 1 x 2.4 GHz + 1 x 2.2 GHz + 6 x 1.8 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 9.2, height: 161.6, width: 71.1}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Qualcomm Adreno 620
@@ -38,5 +38,5 @@ tree: android_device_motorola_racer
 type: phone
 vendor: Motorola
 vendor_short: motorola
-versions: [17.1, 18.1, 19.1, 20]
+versions: [17.1, 18.1, 19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac