diff --git a/godotopenxrkhronos/CMakeLists.txt b/godotopenxrkhronos/CMakeLists.txt
index 4ce32a27..8924ab1f 100644
--- a/godotopenxrkhronos/CMakeLists.txt
+++ b/godotopenxrkhronos/CMakeLists.txt
@@ -7,12 +7,7 @@ project(godotopenxrvendors LANGUAGES CXX)
 include(${PROJECT_SOURCE_DIR}/../common/common.cmake)
 
 ## khronos OpenXR loader library
-set(KHRONOS_OPENXR_LIB_PATH "${PROJECT_SOURCE_DIR}/../thirdparty/khronos_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
-add_library(openxr_loader
-        SHARED
-        IMPORTED GLOBAL
-        )
-set_target_properties(openxr_loader PROPERTIES IMPORTED_LOCATION ${KHRONOS_OPENXR_LIB_PATH})
+find_package(OpenXR REQUIRED CONFIG)
 
 ## Setup the project sources
 file(GLOB_RECURSE ANDROID_SOURCES ${PROJECT_SOURCE_DIR}/src/main/cpp/*.c**)
@@ -37,7 +32,7 @@ target_link_libraries(${PROJECT_NAME}
         android
         log
         ${GODOT-CPP}
-        openxr_loader
+        OpenXR::openxr_loader
         )
 
 # Add the compile flags
diff --git a/godotopenxrkhronos/build.gradle b/godotopenxrkhronos/build.gradle
index 9a40943c..a983c2f8 100644
--- a/godotopenxrkhronos/build.gradle
+++ b/godotopenxrkhronos/build.gradle
@@ -53,6 +53,7 @@ android {
     }
 
     buildFeatures {
+        prefab true
         prefabPublishing true
     }
 
@@ -65,6 +66,7 @@ android {
 
 dependencies {
     compileOnly libraries.godotAndroidLib
+    implementation "org.khronos.openxr:openxr_loader_for_android:1.0.34"
 }
 
 task cleanAssets(type: Delete) {
diff --git a/thirdparty/khronos_openxr_sdk/README.md b/thirdparty/khronos_openxr_sdk/README.md
deleted file mode 100644
index adf3ecb2..00000000
--- a/thirdparty/khronos_openxr_sdk/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Khronos OpenXR Android SDK
-
-Binaries taken from the Official OpenXR working group repo at:
-https://github.com/KhronosGroup/OpenXR-SDK-Source/releases/download/release-1.0.26/openxr_loader_for_android-1.0.26.aar
-
-# AndroidManifest changes
-
-Activities that use OpenXR should add the IMMERSIVE_HMD category tag to their intent-filter
-
-```xml
-<category android:name="org.khronos.openxr.intent.category.IMMERSIVE_HMD" />
-```
-
-for example:
-
-```xml
-    <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-        <category android:name="org.khronos.openxr.intent.category.IMMERSIVE_HMD" />
-    </intent-filter>
-```
-
-Details on this category tag can be found here:
-https://registry.khronos.org/OpenXR/specs/1.0/html/xrspec.html#android-runtime-category
diff --git a/thirdparty/khronos_openxr_sdk/arm64-v8a/abi.json b/thirdparty/khronos_openxr_sdk/arm64-v8a/abi.json
deleted file mode 100644
index d3bc1fac..00000000
--- a/thirdparty/khronos_openxr_sdk/arm64-v8a/abi.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "abi": "arm64-v8a",
-    "api": 1,
-    "ndk": 25,
-    "stl": "none"
-}
diff --git a/thirdparty/khronos_openxr_sdk/arm64-v8a/libopenxr_loader.so b/thirdparty/khronos_openxr_sdk/arm64-v8a/libopenxr_loader.so
deleted file mode 100644
index 770a19b0..00000000
Binary files a/thirdparty/khronos_openxr_sdk/arm64-v8a/libopenxr_loader.so and /dev/null differ
diff --git a/thirdparty/khronos_openxr_sdk/x86_64/abi.json b/thirdparty/khronos_openxr_sdk/x86_64/abi.json
deleted file mode 100644
index 184c1074..00000000
--- a/thirdparty/khronos_openxr_sdk/x86_64/abi.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "abi": "x86_64",
-    "api": 1,
-    "ndk": 25,
-    "stl": "none"
-}
diff --git a/thirdparty/khronos_openxr_sdk/x86_64/libopenxr_loader.so b/thirdparty/khronos_openxr_sdk/x86_64/libopenxr_loader.so
deleted file mode 100644
index 99d73232..00000000
Binary files a/thirdparty/khronos_openxr_sdk/x86_64/libopenxr_loader.so and /dev/null differ