diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 9be9d9a..9e0150d 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -124,8 +124,6 @@ jobs:
 
       - name: Configure CMake
         run: |
-          PKG_CONFIG_PATH="${QT_ROOT_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}" \
-          CMAKE_PREFIX_PATH="${QT_ROOT_DIR}/lib/cmake:${CMAKE_PREFIX_PATH:-}" \
           cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DRUN_CLANG_TIDY=OFF
 
       - name: Build with CMake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 264027a..ca0b82e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,18 @@ find_package(PkgConfig REQUIRED)
 find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia MultimediaWidgets Network QuickControls2 SerialPort Positioning Location QuickWidgets) 
 
 # Add QTermWidget
-pkg_check_modules(QTERMWIDGET REQUIRED IMPORTED_TARGET qtermwidget6)
+# Prefer CMake-native qtermwidget6, fallback to pkg-config if needed
+find_package(qtermwidget6 QUIET)
+
+if(NOT qtermwidget6_FOUND)
+    message(STATUS "qtermwidget6 not found via CMake, trying pkg-config...")
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(QTERMWIDGET REQUIRED IMPORTED_TARGET qtermwidget6)
+    # Create alias so we can use qtermwidget6::qtermwidget6 uniformly
+    add_library(qtermwidget6 ALIAS PkgConfig::QTERMWIDGET)
+else()
+    message(STATUS "Found qtermwidget6 via CMake")
+endif()
 
 if(WIN32)
     # Get the path to the Qt bin directory
@@ -223,7 +234,7 @@ target_link_libraries(iDescriptor PRIVATE
     PkgConfig::USB
     PkgConfig::PLIST
     PkgConfig::QRENCODE
-    PkgConfig::QTERMWIDGET
+    qtermwidget6
     PkgConfig::HEIF
     PkgConfig::ZIP
     airplay