diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index c7176b8d..98e3e16c 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -112,12 +112,9 @@ jobs:
           path: |
             magisk-loader/build/outputs/mapping
             app/build/outputs/mapping
-
-      - name: Upload symbols
-        uses: actions/upload-artifact@v3
-        with:
-          name: symbols
-          path: build/symbols
+            daemon/build/outputs/mapping
+            magisk-loader/build/outputs/native-debug-symbols
+            daemon/build/outputs/native-debug-symbols
 
       - name: Post to channel
         if: ${{ success() && github.event_name != 'pull_request' && github.ref == 'refs/heads/master' && github.ref_type != 'tag' && inputs.post_telegram != 'false' }}
diff --git a/build.gradle.kts b/build.gradle.kts
index db13ac6c..e0a13777 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -47,11 +47,6 @@ cmaker {
         cppFlags.addAll(flags)
         abiFilters("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
     }
-    buildTypes {
-        if (it.name == "release") {
-            arguments += "-DDEBUG_SYMBOLS_PATH=${buildDir.absolutePath}/symbols"
-        }
-    }
 }
 
 val repo = jgit.repo()
diff --git a/core/src/main/jni/CMakeLists.txt b/core/src/main/jni/CMakeLists.txt
index 7e455793..3567302c 100644
--- a/core/src/main/jni/CMakeLists.txt
+++ b/core/src/main/jni/CMakeLists.txt
@@ -1,6 +1,7 @@
-project(core)
 cmake_minimum_required(VERSION 3.4.1)
 
+project(core)
+
 add_subdirectory(${EXTERNAL_ROOT} external)
 
 aux_source_directory(src SRC_LIST)
diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts
index 2c56efa4..0cb1d232 100644
--- a/daemon/build.gradle.kts
+++ b/daemon/build.gradle.kts
@@ -52,6 +52,9 @@ android {
         )
         buildConfigField("String", "MANAGER_INJECTED_PKG_NAME", """"$injectedPackageName"""")
         buildConfigField("int", "MANAGER_INJECTED_UID", """$injectedPackageUid""")
+        ndk {
+            debugSymbolLevel = "FULL"
+        }
     }
 
     buildTypes {
diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
index d95613bc..807034a2 100644
--- a/magisk-loader/build.gradle.kts
+++ b/magisk-loader/build.gradle.kts
@@ -63,6 +63,9 @@ android {
         )
         buildConfigField("String", "MANAGER_INJECTED_PKG_NAME", """"$injectedPackageName"""")
         buildConfigField("int", "MANAGER_INJECTED_UID", """$injectedPackageUid""")
+        ndk {
+            debugSymbolLevel = "FULL"
+        }
     }
 
     buildTypes {
@@ -145,6 +148,7 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
             "assemble$variantCapped",
             ":app:package$buildTypeCapped",
             ":daemon:package$buildTypeCapped",
+            ":daemon:merge${buildTypeCapped}NativeDebugMetadata",
             ":dex2oat:externalNativeBuild${buildTypeCapped}"
         )
         into(magiskDir)