diff --git a/.github/actions/canary-ndk/action.yml b/.github/actions/canary-ndk/action.yml
deleted file mode 100644
index 7322761..0000000
--- a/.github/actions/canary-ndk/action.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: "Setup canary ndk"
-description: "Sets up canary ndk"
-outputs:
-  ndk-path:
-    value: ${{ steps.path.outputs.path }}
-    description: "Output path of the ndk"
-  cache-hit:
-    value: ${{ steps.cache.outputs.cache-hit }}
-    description: "Whether a cache hit occurred for the ndk"
-runs:
-  using: "composite"
-  steps:
-    - name: NDK cache
-      id: cache
-      uses: actions/cache@v3
-      with:
-        path: ${HOME}/android-ndk-r27-canary/
-        key: ${{ runner.os }}-ndk-r27-canary
-
-    - name: Download canary ndk
-      if: ${{ !steps.cache.outputs.cache-hit }}
-      env:
-        CANARY_URL: https://github.com/QuestPackageManager/ndk-canary-archive/releases/download/27.0.1/android-ndk-10883340-linux-x86_64.zip
-      run: wget ${CANARY_URL} -O ${HOME}/ndk.zip
-      shell: bash
-
-    - name: Unzip ndk
-      if: ${{ !steps.cache.outputs.cache-hit }}
-      run: unzip "${HOME}/ndk.zip" -d "${HOME}/"
-      shell: bash
-
-    - name: Set output
-      id: path
-      shell: bash
-      run: echo "path=${HOME}/android-ndk-r27-canary" >> ${GITHUB_OUTPUT}
diff --git a/.github/workflows/build-ndk.yml b/.github/workflows/build-ndk.yml
index c3b10a7..c5b1c53 100644
--- a/.github/workflows/build-ndk.yml
+++ b/.github/workflows/build-ndk.yml
@@ -57,16 +57,6 @@ jobs:
 
     - uses: seanmiddleditch/gha-setup-ninja@v3
 
-    # Use canary NDK to avoid lesser known compile bugs
-    - name: Setup canary NDK
-      id: setup-ndk
-      uses: ./.github/actions/canary-ndk
-
-    - name: Create ndkpath.txt
-      run: |
-        echo ${{ steps.setup-ndk.outputs.ndk-path }} > ${GITHUB_WORKSPACE}/ndkpath.txt
-        cat ${GITHUB_WORKSPACE}/ndkpath.txt
-
     # get version from pushed tag or workflow dispatch
     - name: Extract version
       if: startsWith(github.ref, 'refs/tags/v') || github.event.inputs.version != ''
@@ -116,13 +106,15 @@ jobs:
         cache: true
         publish: false
 
+    - name: Install NDK
+      run: |
+        qpm ndk resolve -d
+
     - name: Build & Create Qmod
       run: |
         cd ${GITHUB_WORKSPACE}
         qpm s qmod
 
-
-
     - name: Get Library Name
       id: libname
       run: |
diff --git a/mod.template.json b/mod.template.json
index 820a399..d2bcad3 100644
--- a/mod.template.json
+++ b/mod.template.json
@@ -7,7 +7,7 @@
   "author": "DanTheMan827",
   "version": "${version}",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.40.0_2229",
+  "packageVersion": "1.40.1_3323",
   "description": "Sets the player age to an adult.",
   "dependencies": [],
   "lateModFiles": ["${binary}"],
diff --git a/qpm.json b/qpm.json
index 906f7fb..79dff5a 100644
--- a/qpm.json
+++ b/qpm.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json",
   "sharedDir": "shared",
   "dependenciesDir": "extern",
   "version": "0.1.0",
@@ -47,12 +48,13 @@
       "./build",
       "./extern/libs"
     ],
-    "qmodOutput": "./Fake ID.qmod"
+    "qmodOutput": "./Fake ID.qmod",
+    "ndk": "^27.0.0"
   },
   "dependencies": [
     {
       "id": "bs-cordl",
-      "versionRange": "4000.*",
+      "versionRange": "4010.*",
       "additionalData": {}
     },
     {
diff --git a/qpm.shared.json b/qpm.shared.json
index f88af95..70b6473 100644
--- a/qpm.shared.json
+++ b/qpm.shared.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.shared.schema.json",
   "config": {
     "version": "0.1.0",
     "sharedDir": "shared",
@@ -44,6 +45,7 @@
           "pwsh ./scripts/pull-tombstone.ps1"
         ]
       },
+      "ndk": "^27.0.0",
       "qmodIncludeDirs": [
         "./build",
         "./extern/libs"
@@ -54,7 +56,7 @@
     "dependencies": [
       {
         "id": "bs-cordl",
-        "versionRange": "4000.*",
+        "versionRange": "4010.*",
         "additionalData": {}
       },
       {
@@ -80,10 +82,10 @@
     {
       "dependency": {
         "id": "bs-cordl",
-        "versionRange": "=4000.2.0",
+        "versionRange": "=4010.0.0",
         "additionalData": {
           "headersOnly": true,
-          "branchName": "version/v4000_2_0",
+          "branchName": "version/v4010_0_0",
           "compileOptions": {
             "includePaths": [
               "include"
@@ -99,7 +101,7 @@
           }
         }
       },
-      "version": "4000.2.0"
+      "version": "4010.0.0"
     },
     {
       "dependency": {