diff --git a/_data/devices/m5.yml b/_data/devices/m5.yml
index 3c1b97847..2442f3c1e 100644
--- a/_data/devices/m5.yml
+++ b/_data/devices/m5.yml
@@ -29,6 +29,6 @@ storage: 16 GB
 tree: android_device_bananapi_m5
 type: Devkit
 vendor: Banana Pi
-vendor_short: amlogic
+vendor_short: bananapi
 versions: [20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/m5_tab.yml b/_data/devices/m5_tab.yml
index 74f76a28b..c75088518 100644
--- a/_data/devices/m5_tab.yml
+++ b/_data/devices/m5_tab.yml
@@ -29,6 +29,6 @@ storage: 16 GB
 tree: android_device_bananapi_m5
 type: Devkit
 vendor: Banana Pi
-vendor_short: amlogic
+vendor_short: bananapi
 versions: [20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/odroidc4.yml b/_data/devices/odroidc4.yml
index 24a49a0e9..84c290b4d 100644
--- a/_data/devices/odroidc4.yml
+++ b/_data/devices/odroidc4.yml
@@ -29,6 +29,6 @@ storage: 16 GB
 tree: android_device_hardkernel_odroidc4
 type: Devkit
 vendor: HardKernel
-vendor_short: amlogic
+vendor_short: hardkernel
 versions: [20, 21, 22.1]
 wifi: None
diff --git a/_data/devices/odroidc4_tab.yml b/_data/devices/odroidc4_tab.yml
index 669860a13..3d28058d9 100644
--- a/_data/devices/odroidc4_tab.yml
+++ b/_data/devices/odroidc4_tab.yml
@@ -29,6 +29,6 @@ storage: 16 GB
 tree: android_device_hardkernel_odroidc4
 type: Devkit
 vendor: HardKernel
-vendor_short: amlogic
+vendor_short: hardkernel
 versions: [20, 21, 22.1]
 wifi: None
diff --git a/_data/devices/radxa0.yml b/_data/devices/radxa0.yml
index 985ac33ed..5e8acb9c9 100644
--- a/_data/devices/radxa0.yml
+++ b/_data/devices/radxa0.yml
@@ -29,6 +29,6 @@ storage: 8/16/32/64/128 GB
 tree: android_device_radxa_radxa0
 type: Devkit
 vendor: Radxa
-vendor_short: amlogic
+vendor_short: radxa
 versions: [20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/_data/devices/radxa0_tab.yml b/_data/devices/radxa0_tab.yml
index 0816b8058..c638f33c4 100644
--- a/_data/devices/radxa0_tab.yml
+++ b/_data/devices/radxa0_tab.yml
@@ -29,6 +29,6 @@ storage: 8/16/32/64/128 GB
 tree: android_device_radxa_radxa0
 type: Devkit
 vendor: Radxa
-vendor_short: amlogic
+vendor_short: radxa
 versions: [20, 21, 22.1]
 wifi: 802.11 a/b/g/n/ac
diff --git a/test/schema-06.yml b/test/schema-06.yml
index bc2c47b86..78678d333 100644
--- a/test/schema-06.yml
+++ b/test/schema-06.yml
@@ -952,11 +952,13 @@ properties:
       - ark
       - askey
       - asus
+      - bananapi
       - bq
       - essential
       - fairphone
       - fxtec
       - google
+      - hardkernel
       - htc
       - huawei
       - leeco
@@ -973,6 +975,7 @@ properties:
       - oneplus
       - oppo
       - osom
+      - radxa
       - razer
       - realme
       - samsung