diff --git a/.SRCINFO b/.SRCINFO
index 7d37826..349873f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = edgetx-companion
 	pkgdesc = EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares
-	pkgver = 2.10.5
+	pkgver = 2.10.4
 	pkgrel = 1
 	url = https://edgetx.org/
 	arch = x86_64
@@ -37,7 +37,7 @@ pkgbase = edgetx-companion
 	provides = companion
 	conflicts = companion
 	options = !debug
-	source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.10.5
+	source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.10.4
 	source = git+https://github.com/raphaelcoeffic/AccessDenied.git
 	source = git+https://github.com/FreeRTOS/FreeRTOS-Kernel.git
 	source = git+https://github.com/adfernandes/segger-rtt.git
@@ -46,7 +46,7 @@ pkgbase = edgetx-companion
 	source = git+https://github.com/EdgeTX/lvgl.git
 	source = git+https://github.com/nothings/stb.git
 	source = install.patch
-	b2sums = 42eaab499620cb2e978c0bb8bf34624f18d05d87f916ee60c3f1684a71e3912a4d4865d28b8cd954a7f1610c919c68bd69e5e2e11004b6c1099772b3487603dc
+	b2sums = cd3c79ccfd590049a5e703cd4c9e6ddd645ba96571dbb259725134933e9b027ff5d69a55732c8731f91345d3eb25acb613816c2cf5aa692126b0f3cc98fc7885
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7787dd1..22ec44a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributer: Arnaud
 
 pkgname=edgetx-companion
-pkgver=2.10.5
+pkgver=2.10.4
 pkgrel=1
 pkgdesc="EEPROM Editor and Simulator for EdgeTX RC radio transmitter firmwares"
 arch=('x86_64')
@@ -28,7 +28,7 @@ source=("git+https://github.com/EdgeTX/edgetx.git#tag=v$pkgver"
         "git+https://github.com/EdgeTX/lvgl.git"
         "git+https://github.com/nothings/stb.git"
         install.patch)
-b2sums=('42eaab499620cb2e978c0bb8bf34624f18d05d87f916ee60c3f1684a71e3912a4d4865d28b8cd954a7f1610c919c68bd69e5e2e11004b6c1099772b3487603dc'
+b2sums=('cd3c79ccfd590049a5e703cd4c9e6ddd645ba96571dbb259725134933e9b027ff5d69a55732c8731f91345d3eb25acb613816c2cf5aa692126b0f3cc98fc7885'
         'SKIP'
         'SKIP'
         'SKIP'
@@ -50,24 +50,20 @@ prepare() {
       sed -i "s/if(${pattern}_FOUND)/if(false)/g" ./companion/src/CMakeLists.txt
   done
   
-  cd "$_pkgbase/radio/src/thirdparty/"
-  git submodule init
-  git config submodule.AccessDenied.url $srcdir/AccessDenied
-  git config submodule.FreeRTOS-Kernel.url $srcdir/FreeRTOS-Kernel
-  git config submodule.Segger_RTT.url $srcdir/Segger_RTT
-  git submodule update --init
+  declare -A submodules=(
+    ["$_pkgbase/radio/src/thirdparty/"]="AccessDenied FreeRTOS-Kernel Segger_RTT"
+    ["$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"]="FreeRTOS-Kernel-Community-Supported-Ports FreeRTOS-Kernel-Partner-Supported-Ports"
+    ["$_pkgbase/radio/src/thirdparty/libopenui/thirdparty/"]="lvgl stb"
+  )
 
-  cd "$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"
-  git submodule init
-  git config submodule.FreeRTOS-Kernel-Community-Supported-Ports.url $srcdir/FreeRTOS-Kernel-Community-Supported-Ports
-  git config submodule.FreeRTOS-Kernel-Partner-Supported-Ports.url $srcdir/FreeRTOS-Kernel-Partner-Supported-Ports
-  git submodule update --init
-
-  cd "$_pkgbase/radio/src/thirdparty/libopenui/thirdparty/"
-  git submodule init
-  git config submodule.lvgl.url $srcdir/lvgl
-  git config submodule.stb.url $srcdir/stb
-  git submodule update --init
+  for path in "${!submodules[@]}"; do
+    cd $path
+    git submodule init
+    for module in ${submodules[$path]}; do
+      git config submodule.$module.url $srcdir/$module
+    done
+    git submodule update --init
+  done
 }
 
 build() {