diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 4b71d28..2a01c25 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -98,10 +98,10 @@ jobs:
           - ssc378qe_fpv
 
           # Ruby
-          - gk7205v200_rubyfpv
-          - ssc30kq_rubyfpv
-          - ssc338q_rubyfpv
-          - ssc338q_rubyfpv_thinker_internal_wifi
+          - rubyfpv_generic_soc_gk7205v200
+          - rubyfpv_generic_soc_ssc30kq
+          - rubyfpv_generic_soc_ssc338q
+          - rubyfpv_thinker_internal_wifi
 
           # LTE
           - hi3516ev200_lte
diff --git a/devices/gk7205v200_rubyfpv/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic-fpv.config b/devices/rubyfpv_generic_soc_gk7205v200/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic-fpv.config
similarity index 100%
rename from devices/gk7205v200_rubyfpv/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic-fpv.config
rename to devices/rubyfpv_generic_soc_gk7205v200/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic-fpv.config
diff --git a/devices/gk7205v200_rubyfpv/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig b/devices/rubyfpv_generic_soc_gk7205v200/br-ext-chip-goke/configs/rubyfpv_generic_soc_gk7205v200_defconfig
similarity index 100%
rename from devices/gk7205v200_rubyfpv/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig
rename to devices/rubyfpv_generic_soc_gk7205v200/br-ext-chip-goke/configs/rubyfpv_generic_soc_gk7205v200_defconfig
diff --git a/devices/ssc338q_rubyfpv_thinker_internal_wifi/general/overlay/usr/share/openipc/customizer.sh b/devices/rubyfpv_generic_soc_gk7205v200/general/overlay/usr/share/openipc/customizer.sh
similarity index 63%
rename from devices/ssc338q_rubyfpv_thinker_internal_wifi/general/overlay/usr/share/openipc/customizer.sh
rename to devices/rubyfpv_generic_soc_gk7205v200/general/overlay/usr/share/openipc/customizer.sh
index f118caf..c4c54c2 100644
--- a/devices/ssc338q_rubyfpv_thinker_internal_wifi/general/overlay/usr/share/openipc/customizer.sh
+++ b/devices/rubyfpv_generic_soc_gk7205v200/general/overlay/usr/share/openipc/customizer.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Set custom upgrade url
-fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/ssc338q_rubyfpv_thinker_internal_wifi-nor.tgz'
+#
+fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/rubyfpv_generic_soc_gk7205v200-nor.tgz'
 
 exit 0
diff --git a/devices/gk7205v200_rubyfpv/general/scripts/excludes/gk7205v200_rubyfpv.list b/devices/rubyfpv_generic_soc_gk7205v200/general/scripts/excludes/gk7205v200_rubyfpv.list
similarity index 100%
rename from devices/gk7205v200_rubyfpv/general/scripts/excludes/gk7205v200_rubyfpv.list
rename to devices/rubyfpv_generic_soc_gk7205v200/general/scripts/excludes/gk7205v200_rubyfpv.list
diff --git a/devices/ssc30kq_rubyfpv/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig b/devices/rubyfpv_generic_soc_ssc30kq/br-ext-chip-sigmastar/configs/rubyfpv_generic_soc_ssc30kq_defconfig
similarity index 100%
rename from devices/ssc30kq_rubyfpv/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig
rename to devices/rubyfpv_generic_soc_ssc30kq/br-ext-chip-sigmastar/configs/rubyfpv_generic_soc_ssc30kq_defconfig
diff --git a/devices/gk7205v200_rubyfpv/general/overlay/usr/share/openipc/customizer.sh b/devices/rubyfpv_generic_soc_ssc30kq/general/overlay/usr/share/openipc/customizer.sh
similarity index 67%
rename from devices/gk7205v200_rubyfpv/general/overlay/usr/share/openipc/customizer.sh
rename to devices/rubyfpv_generic_soc_ssc30kq/general/overlay/usr/share/openipc/customizer.sh
index 918105b..1c547fe 100644
--- a/devices/gk7205v200_rubyfpv/general/overlay/usr/share/openipc/customizer.sh
+++ b/devices/rubyfpv_generic_soc_ssc30kq/general/overlay/usr/share/openipc/customizer.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # Set custom upgrade url
-#
-fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/gk7205v200_rubyfpv-nor.tgz'
+fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/rubyfpv_generic_soc_ssc30kq-nor.tgz'
 
 exit 0
diff --git a/devices/ssc30kq_rubyfpv/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/devices/rubyfpv_generic_soc_ssc30kq/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
similarity index 100%
rename from devices/ssc30kq_rubyfpv/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
rename to devices/rubyfpv_generic_soc_ssc30kq/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
diff --git a/devices/ssc30kq_rubyfpv/general/scripts/excludes/ssc30kq_rubyfpv.list b/devices/rubyfpv_generic_soc_ssc30kq/general/scripts/excludes/ssc30kq_rubyfpv.list
similarity index 100%
rename from devices/ssc30kq_rubyfpv/general/scripts/excludes/ssc30kq_rubyfpv.list
rename to devices/rubyfpv_generic_soc_ssc30kq/general/scripts/excludes/ssc30kq_rubyfpv.list
diff --git a/devices/ssc338q_rubyfpv/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig b/devices/rubyfpv_generic_soc_ssc338q/br-ext-chip-sigmastar/configs/rubyfpv_generic_soc_ssc338q_defconfig
similarity index 100%
rename from devices/ssc338q_rubyfpv/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig
rename to devices/rubyfpv_generic_soc_ssc338q/br-ext-chip-sigmastar/configs/rubyfpv_generic_soc_ssc338q_defconfig
diff --git a/devices/ssc30kq_rubyfpv/general/overlay/usr/share/openipc/customizer.sh b/devices/rubyfpv_generic_soc_ssc338q/general/overlay/usr/share/openipc/customizer.sh
similarity index 67%
rename from devices/ssc30kq_rubyfpv/general/overlay/usr/share/openipc/customizer.sh
rename to devices/rubyfpv_generic_soc_ssc338q/general/overlay/usr/share/openipc/customizer.sh
index 4d3a9e2..714088a 100644
--- a/devices/ssc30kq_rubyfpv/general/overlay/usr/share/openipc/customizer.sh
+++ b/devices/rubyfpv_generic_soc_ssc338q/general/overlay/usr/share/openipc/customizer.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # Set custom upgrade url
-fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/ssc30kq_rubyfpv-nor.tgz'
+fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/rubyfpv_generic_soc_ssc338q-nor.tgz'
 
 exit 0
diff --git a/devices/ssc338q_rubyfpv/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/devices/rubyfpv_generic_soc_ssc338q/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
similarity index 100%
rename from devices/ssc338q_rubyfpv/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
rename to devices/rubyfpv_generic_soc_ssc338q/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
diff --git a/devices/ssc338q_rubyfpv/general/scripts/excludes/ssc338q_rubyfpv.list b/devices/rubyfpv_generic_soc_ssc338q/general/scripts/excludes/ssc338q_rubyfpv.list
similarity index 100%
rename from devices/ssc338q_rubyfpv/general/scripts/excludes/ssc338q_rubyfpv.list
rename to devices/rubyfpv_generic_soc_ssc338q/general/scripts/excludes/ssc338q_rubyfpv.list
diff --git a/devices/ssc338q_rubyfpv_thinker_internal_wifi/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_thinker_internal_wifi_defconfig b/devices/rubyfpv_thinker_internal_wifi/br-ext-chip-sigmastar/configs/rubyfpv_thinker_internal_wifi_defconfig
similarity index 100%
rename from devices/ssc338q_rubyfpv_thinker_internal_wifi/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_thinker_internal_wifi_defconfig
rename to devices/rubyfpv_thinker_internal_wifi/br-ext-chip-sigmastar/configs/rubyfpv_thinker_internal_wifi_defconfig
diff --git a/devices/ssc338q_rubyfpv/general/overlay/usr/share/openipc/customizer.sh b/devices/rubyfpv_thinker_internal_wifi/general/overlay/usr/share/openipc/customizer.sh
similarity index 66%
rename from devices/ssc338q_rubyfpv/general/overlay/usr/share/openipc/customizer.sh
rename to devices/rubyfpv_thinker_internal_wifi/general/overlay/usr/share/openipc/customizer.sh
index e69cf3a..a565672 100644
--- a/devices/ssc338q_rubyfpv/general/overlay/usr/share/openipc/customizer.sh
+++ b/devices/rubyfpv_thinker_internal_wifi/general/overlay/usr/share/openipc/customizer.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # Set custom upgrade url
-fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/ssc338q_rubyfpv-nor.tgz'
+fw_setenv upgrade 'https://github.com/OpenIPC/builder/releases/download/latest/rubyfpv_thinker_internal_wifi-nor.tgz'
 
 exit 0
diff --git a/devices/ssc338q_rubyfpv_thinker_internal_wifi/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/devices/rubyfpv_thinker_internal_wifi/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
similarity index 100%
rename from devices/ssc338q_rubyfpv_thinker_internal_wifi/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
rename to devices/rubyfpv_thinker_internal_wifi/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
diff --git a/devices/ssc338q_rubyfpv_thinker_internal_wifi/general/scripts/excludes/ssc338q_rubyfpv.list b/devices/rubyfpv_thinker_internal_wifi/general/scripts/excludes/ssc338q_rubyfpv.list
similarity index 100%
rename from devices/ssc338q_rubyfpv_thinker_internal_wifi/general/scripts/excludes/ssc338q_rubyfpv.list
rename to devices/rubyfpv_thinker_internal_wifi/general/scripts/excludes/ssc338q_rubyfpv.list