diff --git a/PKGBUILD b/PKGBUILD
index 9e67dea..e1b671d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,12 +38,15 @@ b2sums=('024826402eaf156b36d300d162a0e90a70f82902901e3a78a669d0c6f63dc12b7cbebec
         'SKIP')
 
 prepare() {
+  _pkgbase="$srcdir/${pkgname%%-*}"
+  cd "$_pkgbase"
+
   # Deactivate these statements; they bundle the libs for AppImage.
   for pattern in "LIBSSL1" "LIBUSB1" "DFU_UTIL"; do
-      sed -i "s/if(${pattern}_FOUND)/if(false)/g" ./edgetx/companion/src/CMakeLists.txt
+      sed -i "s/if(${pattern}_FOUND)/if(false)/g" ./companion/src/CMakeLists.txt
   done
 
-  cd "$srcdir/edgetx/radio/src/thirdparty/"
+  cd "$_pkgbase/radio/src/thirdparty/"
   git submodule init
   git config submodule.AccessDenied.url "$srcdir/AccessDenied"
   git config submodule.FreeRTOS-Kernel.url "$srcdir/FreeRTOS-Kernel"
@@ -53,13 +56,13 @@ prepare() {
   git config submodule.uf2.url "$srcdir/uf2"
   git submodule update --init
 
-  cd "$srcdir/edgetx/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"
+  cd "$_pkgbase/radio/src/thirdparty/FreeRTOS/portable/ThirdParty/"
   git submodule init
   git config submodule.FreeRTOS-Kernel-Community-Supported-Ports.url "$srcdir/Community-Supported-Ports"
   git config submodule.FreeRTOS-Kernel-Partner-Supported-Ports.url "$srcdir/Partner-Supported-Ports"
   git submodule update --init
 
-  cd "$srcdir/edgetx/radio/src/thirdparty/uf2/"
+  cd "$_pkgbase/radio/src/thirdparty/uf2/"
   git submodule init
   git config submodule.hidapi.url "$srcdir/hidapi"
   git -c protocol.file.allow=always submodule update --init
@@ -103,8 +106,7 @@ build() {
     cmake --build native --target libsimulator
   done
 
-  cmake --build . --target native-configure
-  cmake --build native --target companion
+  cmake ${BUILD_OPTIONS} "$srcdir/edgetx/build/native"
 }
 
 package() {