diff --git a/_data/devices/haydn_variant1.yml b/_data/devices/haydn_variant1.yml
index dc29c76a98..8137d64887 100644
--- a/_data/devices/haydn_variant1.yml
+++ b/_data/devices/haydn_variant1.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 4520, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: haydn
 cpu: Kryo 680
 cpu_cores: '8'
 cpu_freq: 2,84 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 7.87, height: 163.57, width: 76.45}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 660
@@ -37,5 +37,5 @@ type: phone
 variant: 1
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/haydn_variant2.yml b/_data/devices/haydn_variant2.yml
index 7149815707..1e1116f591 100644
--- a/_data/devices/haydn_variant2.yml
+++ b/_data/devices/haydn_variant2.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 4520, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: haydn
 cpu: Kryo 680
 cpu_cores: '8'
 cpu_freq: 2,84 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 7.87, height: 163.57, width: 76.45}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 660
@@ -37,5 +37,5 @@ type: phone
 variant: 2
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/haydn_variant3.yml b/_data/devices/haydn_variant3.yml
index 7e8f3aff0e..eaa3e38390 100644
--- a/_data/devices/haydn_variant3.yml
+++ b/_data/devices/haydn_variant3.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 4520, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: haydn
 cpu: Kryo 680
 cpu_cores: '8'
 cpu_freq: 2,84 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 7.87, height: 163.57, width: 76.45}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 660
@@ -37,5 +37,5 @@ type: phone
 variant: 3
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/haydn_variant4.yml b/_data/devices/haydn_variant4.yml
index a663f1c044..88c413eb22 100644
--- a/_data/devices/haydn_variant4.yml
+++ b/_data/devices/haydn_variant4.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 4520, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: haydn
 cpu: Kryo 680
 cpu_cores: '8'
 cpu_freq: 2,84 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 7.87, height: 163.57, width: 76.45}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 660
@@ -37,5 +37,5 @@ type: phone
 variant: 4
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/lisa_variant1.yml b/_data/devices/lisa_variant1.yml
index 0eb5a163ef..fe7390da42 100644
--- a/_data/devices/lisa_variant1.yml
+++ b/_data/devices/lisa_variant1.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 4250, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: lisa
 cpu: Kryo 670
 cpu_cores: '8'
 cpu_freq: 2.4 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 6.81, height: 160.53, width: 75.73}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 642L
@@ -38,5 +38,5 @@ type: phone
 variant: 1
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/lisa_variant2.yml b/_data/devices/lisa_variant2.yml
index f8823b801b..34f8b21fb5 100644
--- a/_data/devices/lisa_variant2.yml
+++ b/_data/devices/lisa_variant2.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 4250, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: lisa
 cpu: Kryo 670
 cpu_cores: '8'
 cpu_freq: 2.4 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 6.81, height: 160.53, width: 75.73}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 642L
@@ -38,5 +38,5 @@ type: phone
 variant: 2
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/lisa_variant3.yml b/_data/devices/lisa_variant3.yml
index 71114d2260..c6f356abfd 100644
--- a/_data/devices/lisa_variant3.yml
+++ b/_data/devices/lisa_variant3.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 4250, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: lisa
 cpu: Kryo 670
 cpu_cores: '8'
 cpu_freq: 2.4 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 6.81, height: 160.53, width: 75.73}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 642L
@@ -38,5 +38,5 @@ type: phone
 variant: 3
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/mars.yml b/_data/devices/mars.yml
index d5d9e4123b..caaa02bc0a 100644
--- a/_data/devices/mars.yml
+++ b/_data/devices/mars.yml
@@ -1,6 +1,6 @@
 architecture: arm64
 battery: {capacity: 5000, removable: False, tech: 'Li-Po'}
-before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '13'}
+before_install: {instructions: 'needs_specific_android_fw', ships_fw: True, version: '14'}
 before_recovery_install: {instructions: 'boot_stack', partitions: [dtbo, vendor_boot]}
 bluetooth: {profiles: [A2DP + aptX HD], spec: '5.2'}
 cameras:
@@ -12,7 +12,7 @@ codename: mars
 cpu: Kryo 680
 cpu_cores: '8'
 cpu_freq: 1 x 2.84 GHz + 3 x 2.42 GHz + 4 x 1.8 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 8.5, height: 164.3, width: 74.6}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 660
@@ -36,5 +36,5 @@ tree: android_device_xiaomi_mars
 type: phone
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [20]
+versions: [20, 21]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/renoir.yml b/_data/devices/renoir.yml
index 0af5628510..cf9222196a 100644
--- a/_data/devices/renoir.yml
+++ b/_data/devices/renoir.yml
@@ -12,7 +12,7 @@ codename: renoir
 cpu: Kryo 670
 cpu_cores: '8'
 cpu_freq: 2.4 GHz
-current_branch: 20
+current_branch: 21
 dimensions: {depth: 6.81, height: 160.53, width: 75.73}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Keep holding both buttons until the word "FASTBOOT" appears on the screen, then release.
 gpu: Qualcomm Adreno 642
@@ -37,5 +37,5 @@ tree: android_device_xiaomi_renoir
 type: phone
 vendor: Xiaomi
 vendor_short: xiaomi
-versions: [19.1, 20]
+versions: [19.1, 20, 21]
 wifi: 802.11 a/b/g/n/ac/ax