diff --git a/_data/devices/foster_tab_variant1.yml b/_data/devices/foster_tab_variant1.yml
index 1c8a336b..e7b22d32 100644
--- a/_data/devices/foster_tab_variant1.yml
+++ b/_data/devices/foster_tab_variant1.yml
@@ -7,7 +7,7 @@ codename: foster_tab
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: None
 gpu: NVIDIA GM20B (Maxwell)
 image: foster.png
@@ -35,5 +35,5 @@ type: Set top box
 variant: 1
 vendor: NVIDIA
 vendor_short: nvidia
-versions: [14.1, 15.1, 17.1, 18.1, 20, 21]
+versions: [14.1, 15.1, 17.1, 18.1, 20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/foster_tab_variant2.yml b/_data/devices/foster_tab_variant2.yml
index 4e3875f8..6ed1fc4a 100644
--- a/_data/devices/foster_tab_variant2.yml
+++ b/_data/devices/foster_tab_variant2.yml
@@ -6,7 +6,7 @@ codename: foster_tab
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: None
 download_boot:  With the device off, press the <kbd>FRC REC</kbd> button, then tap power. Release the <kbd>FRC REC</kbd> button once apx enumerates.
 flash_codename: p2371
@@ -36,5 +36,5 @@ type: Set top box
 variant: 2
 vendor: NVIDIA
 vendor_short: nvidia
-versions: [14.1, 15.1, 17.1, 18.1, 20, 21]
+versions: [14.1, 15.1, 17.1, 18.1, 20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/foster_variant1.yml b/_data/devices/foster_variant1.yml
index d2be3210..379b2296 100644
--- a/_data/devices/foster_variant1.yml
+++ b/_data/devices/foster_variant1.yml
@@ -7,7 +7,7 @@ codename: foster
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: None
 gpu: NVIDIA GM20B (Maxwell)
 image: foster.png
@@ -35,5 +35,5 @@ type: Set top box
 variant: 1
 vendor: NVIDIA
 vendor_short: nvidia
-versions: [14.1, 15.1, 17.1, 18.1, 20, 21]
+versions: [14.1, 15.1, 17.1, 18.1, 20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/foster_variant2.yml b/_data/devices/foster_variant2.yml
index 814e0dca..ccd6922d 100644
--- a/_data/devices/foster_variant2.yml
+++ b/_data/devices/foster_variant2.yml
@@ -6,7 +6,7 @@ codename: foster
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: None
 download_boot:  With the device off, press the <kbd>FRC REC</kbd> button, then tap power. Release the <kbd>FRC REC</kbd> button once the apx enumerates.
 flash_codename: p2371
@@ -36,5 +36,5 @@ type: Set top box
 variant: 2
 vendor: NVIDIA
 vendor_short: nvidia
-versions: [14.1, 15.1, 17.1, 18.1, 20, 21]
+versions: [14.1, 15.1, 17.1, 18.1, 20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/ingot.yml b/_data/devices/ingot.yml
index d3e9b7d3..9572e329 100644
--- a/_data/devices/ingot.yml
+++ b/_data/devices/ingot.yml
@@ -11,7 +11,7 @@ codename: ingot
 cpu: Kryo 780
 cpu_cores: '8'
 cpu_freq: 1 x 3.2 GHz + 3 x 2.5 GHz + 4 x 1.8 GHz
-current_branch: 21
+current_branch: 22.1
 custom_unlock_cmd: 'fastboot flashing unlock'
 dimensions: {depth: 8.4, height: 164, width: 75.3}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
@@ -36,5 +36,5 @@ tree: android_device_osom_ingot
 type: phone
 vendor: Solana
 vendor_short: osom
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac/ax
diff --git a/_data/devices/nx_tab_variant1.yml b/_data/devices/nx_tab_variant1.yml
index becfdc38..8f35ff20 100644
--- a/_data/devices/nx_tab_variant1.yml
+++ b/_data/devices/nx_tab_variant1.yml
@@ -6,7 +6,7 @@ codename: nx_tab
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 13.9, height: 102, width: 239}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 1
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nx_tab_variant2.yml b/_data/devices/nx_tab_variant2.yml
index 533409a1..609d852a 100644
--- a/_data/devices/nx_tab_variant2.yml
+++ b/_data/devices/nx_tab_variant2.yml
@@ -6,7 +6,7 @@ codename: nx_tab
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 13.9, height: 102, width: 239}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 2
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nx_tab_variant3.yml b/_data/devices/nx_tab_variant3.yml
index 8514cfd6..a96c5de4 100644
--- a/_data/devices/nx_tab_variant3.yml
+++ b/_data/devices/nx_tab_variant3.yml
@@ -6,7 +6,7 @@ codename: nx_tab
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 14, height: 91, width: 208}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx_lite.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 3
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nx_tab_variant4.yml b/_data/devices/nx_tab_variant4.yml
index 7a190e66..0b1190ea 100644
--- a/_data/devices/nx_tab_variant4.yml
+++ b/_data/devices/nx_tab_variant4.yml
@@ -6,7 +6,7 @@ codename: nx_tab
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 14, height: 102, width: 242}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx_oled.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 4
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nx_variant1.yml b/_data/devices/nx_variant1.yml
index 6d32dbad..456f67a0 100644
--- a/_data/devices/nx_variant1.yml
+++ b/_data/devices/nx_variant1.yml
@@ -6,7 +6,7 @@ codename: nx
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 13.9, height: 102, width: 239}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 1
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nx_variant2.yml b/_data/devices/nx_variant2.yml
index 1e3cf0e9..83a3d6fa 100644
--- a/_data/devices/nx_variant2.yml
+++ b/_data/devices/nx_variant2.yml
@@ -6,7 +6,7 @@ codename: nx
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 13.9, height: 102, width: 239}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 2
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nx_variant3.yml b/_data/devices/nx_variant3.yml
index 787e00d0..44d87600 100644
--- a/_data/devices/nx_variant3.yml
+++ b/_data/devices/nx_variant3.yml
@@ -6,7 +6,7 @@ codename: nx
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 14, height: 91, width: 208}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx_lite.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 3
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/nx_variant4.yml b/_data/devices/nx_variant4.yml
index a6d5b244..44da711e 100644
--- a/_data/devices/nx_variant4.yml
+++ b/_data/devices/nx_variant4.yml
@@ -6,7 +6,7 @@ codename: nx
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 14, height: 102, width: 242}
 gpu: NVIDIA GM20B (Maxwell)
 image: nx_oled.png
@@ -33,5 +33,5 @@ type: Handheld game console
 variant: 4
 vendor: Nintendo
 vendor_short: nintendo
-versions: [21]
+versions: [21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/sif.yml b/_data/devices/sif.yml
index 15f3f9a8..c14bc64e 100644
--- a/_data/devices/sif.yml
+++ b/_data/devices/sif.yml
@@ -7,7 +7,7 @@ codename: sif
 cpu: Cortex-A57
 cpu_cores: '4'
 cpu_freq: 1.9 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: None
 download_boot: With the device unplugged, plug in the device while holding the <kbd>Pairing Button</kbd> until a menu is displayed.
 gpu: NVIDIA GM20B (Maxwell)
@@ -34,5 +34,5 @@ tree: android_device_nvidia_sif
 type: Set top box
 vendor: NVIDIA
 vendor_short: nvidia
-versions: [20, 21]
+versions: [20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac