diff --git a/.github/release-tag.json b/.github/release-tag.json
index c8ade6b810..24f3d7c3a5 100644
--- a/.github/release-tag.json
+++ b/.github/release-tag.json
@@ -1,4 +1,4 @@
 {
-  "message": "xpro version 25.2.10.5 tag",
-  "tag": "xpv25.2.10.5"
+  "message": "xpro version 25.2.10.6 tag",
+  "tag": "xpv25.2.10.6"
 }
diff --git a/CMake/xpflatbuffers.cmake b/CMake/xpflatbuffers.cmake
index 4fda7e9913..b28eb25a46 100644
--- a/CMake/xpflatbuffers.cmake
+++ b/CMake/xpflatbuffers.cmake
@@ -14,7 +14,7 @@ function(xpFlatBuffersBuild)
     set(P_GENERATED_INCLUDES_DIR ${CMAKE_CURRENT_BINARY_DIR}/fbs)
   endif()
   if(NOT COMMAND build_flatbuffers)
-    include(${CMAKE_CURRENT_LIST_DIR}/BuildFlatBuffers.cmake)
+    include(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/BuildFlatBuffers.cmake)
   endif()
   build_flatbuffers("${P_SCHEMAS}" "${P_SCHEMA_INCLUDE_DIRS}" ${P_CUSTOM_TARGET_NAME}
     "${P_ADDITIONAL_DEPS}" "${P_GENERATED_INCLUDES_DIR}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6bee174b8..75912bf514 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -623,7 +623,7 @@ if(FLATBUFFERS_INSTALL)
       )
     xpExternPackage(REPO_NAME flatbuffers TARGETS_FILE FlatBuffersTargets
       EXE flatc LIBRARIES flatbuffers DEFAULT_TARGETS flatbuffers
-      BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch"
+      BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch" FIND_XPRO_CMAKE
       WEB "http://google.github.io/flatbuffers/" UPSTREAM "github.com/google/flatbuffers"
       DESC "efficient cross platform serialization library"
       LICENSE "[Apache-2.0](https://github.com/google/flatbuffers/blob/v25.2.10/LICENSE 'Apache License, Version 2.0')"