diff --git a/_data/devices/FP3_variant1.yml b/_data/devices/FP3_variant1.yml
index 5c9e8e395..3c8391618 100644
--- a/_data/devices/FP3_variant1.yml
+++ b/_data/devices/FP3_variant1.yml
@@ -8,7 +8,7 @@ codename: FP3
 cpu: Kryo 250
 cpu_cores: '4'
 cpu_freq: 1.8 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 9.89, height: 158, width: 71.8}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Release when boot logo appears.
 gpu: Qualcomm Adreno 506
@@ -16,7 +16,7 @@ image: FP3.png
 install_method: fastboot_fairphone
 is_ab_device: true
 kernel: {repo: android_kernel_fairphone_sdm632, version: '4.9'}
-maintainers: [teamb58, dk1978]
+maintainers: [teamb58]
 name: '3'
 network: [2G GSM, 3G UMTS, 4G LTE]
 peripherals: [3.5mm jack, Accelerometer, Compass, Dual SIM, Fingerprint reader, Galileo, GLONASS, GPS, Gyroscope, Light sensor, NFC, Proximity sensor, RGB ambient light]
@@ -34,5 +34,5 @@ type: phone
 variant: 1
 vendor: Fairphone
 vendor_short: fairphone
-versions: [16.0, 17.1, 18.1, 19.1, 20, 21]
+versions: [16.0, 17.1, 18.1, 19.1, 20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/FP3_variant2.yml b/_data/devices/FP3_variant2.yml
index 308825ed4..fbc495fe4 100644
--- a/_data/devices/FP3_variant2.yml
+++ b/_data/devices/FP3_variant2.yml
@@ -8,7 +8,7 @@ codename: FP3
 cpu: Kryo 250
 cpu_cores: '4'
 cpu_freq: 1.8 GHz
-current_branch: 21
+current_branch: 22.1
 dimensions: {depth: 9.89, height: 158, width: 71.8}
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>. Release when boot logo appears.
 gpu: Qualcomm Adreno 506
@@ -16,7 +16,7 @@ image: FP3.png
 install_method: fastboot_fairphone
 is_ab_device: true
 kernel: {repo: android_kernel_fairphone_sdm632, version: '4.9'}
-maintainers: [teamb58, dk1978]
+maintainers: [teamb58]
 name: '3+'
 network: [2G GSM, 3G UMTS, 4G LTE]
 peripherals: [3.5mm jack, Accelerometer, Compass, Dual SIM, Fingerprint reader, Galileo, GLONASS, GPS, Gyroscope, Light sensor, NFC, Proximity sensor, RGB ambient light]
@@ -34,5 +34,5 @@ type: phone
 variant: 2
 vendor: Fairphone
 vendor_short: fairphone
-versions: [16.0, 17.1, 18.1, 19.1, 20, 21]
+versions: [16.0, 17.1, 18.1, 19.1, 20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac