diff --git a/.gitmodules b/.gitmodules
index 3ceaa56e..e9e25286 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "client/3rd/OpenVPNAdapter"]
 	path = client/3rd/OpenVPNAdapter
 	url = https://github.com/amnezia-vpn/OpenVPNAdapter.git
+        branch = macos-dirty-build
 [submodule "client/3rd/qtkeychain"]
 	path = client/3rd/qtkeychain
 	url = https://github.com/frankosterfeld/qtkeychain.git
@@ -10,6 +11,7 @@
 [submodule "client/3rd-prebuilt"]
 	path = client/3rd-prebuilt
 	url = https://github.com/amnezia-vpn/3rd-prebuilt
+        branch = fixbug/mac-network-extension
 [submodule "client/3rd/amneziawg-apple"]
 	path = client/3rd/amneziawg-apple
 	url = https://github.com/amnezia-vpn/amneziawg-apple
diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt
index ba580dc5..435aaa79 160000
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
@@ -1 +1 @@
-Subproject commit ba580dc5bd7784f7b1e110ff0365f3286e549a61
+Subproject commit 435aaa793d8ce455ef4a3b2f5ff5e38f187d8efb
diff --git a/client/macos/scripts/openvpn.sh b/client/macos/scripts/openvpn.sh
index 1a0bba47..8c371618 100644
--- a/client/macos/scripts/openvpn.sh
+++ b/client/macos/scripts/openvpn.sh
@@ -4,10 +4,10 @@ XCODEBUILD="/usr/bin/xcodebuild"
 WORKINGDIR=`pwd`
 PATCH="/usr/bin/patch"
 
-echo "Building OpenVPNAdapter for macOS ..."
+echo "Building OpenVPNAdapter for macOS Network Extension (MacNE)..."
 
-# Copy the Project.xcconfig settings to amnezia.xcconfig
-cat $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/Project.xcconfig > $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig
+# Copy the Project-MacNE.xcconfig settings to amnezia.xcconfig
+cat $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/Project-MacNE.xcconfig > $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig
 
 # Append macOS-specific build directory configurations to amnezia.xcconfig
 cat << EOF >> $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig
@@ -16,8 +16,8 @@ CONFIGURATION_BUILD_DIR = $WORKINGDIR/3rd/OpenVPNAdapter/build/Release-macos
 BUILT_PRODUCTS_DIR = $WORKINGDIR/3rd/OpenVPNAdapter/build/Release-macos
 EOF
 
-# Add LDFLAGS for macOS, exclude UIKit which is for iOS only
-echo "OTHER_LDFLAGS = -framework Cocoa" >> $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig
+# Exclude UIKit, include Cocoa for macOS
+# echo "OTHER_LDFLAGS = -framework Cocoa" >> $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig
 
 # Fetch the current macOS SDK version dynamically
 MACOSX_SDK=$(xcrun --sdk macosx --show-sdk-path | sed -E 's/.*MacOSX([0-9]+\.[0-9]+)\.sdk/\1/')
@@ -28,9 +28,9 @@ cd 3rd/OpenVPNAdapter
 
 # Build for macOS using the correct SDK and destination
 if $XCODEBUILD -scheme OpenVPNAdapter -configuration Release -xcconfig Configuration/amnezia.xcconfig -sdk macosx$MACOSX_SDK -destination 'generic/platform=macOS' -project OpenVPNAdapter.xcodeproj ; then
-  echo "OpenVPNAdapter built successfully for macOS"
+  echo "OpenVPNAdapter built successfully for macOS Network Extension (MacNE)"
 else
-  echo "OpenVPNAdapter macOS build failed ..."
+  echo "OpenVPNAdapter macOS Network Extension (MacNE) build failed..."
 fi
 
 # Remove CodeSignature if needed for macOS