diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ca62e59d..5bf6b98e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,8 @@ name: Main Suite
 on:
   pull_request:
     branches:
-      - '*'
+      - main
+      - 'versions/**'
   push:
     branches:
       - main
diff --git a/.github/workflows/docs-validation.yml b/.github/workflows/docs-validation.yml
index 7350f40f3..d6988b88e 100644
--- a/.github/workflows/docs-validation.yml
+++ b/.github/workflows/docs-validation.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - 'versions/**'
     # Review gh actions docs if you want to further define triggers, paths, etc
     # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#on
 
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 7ecbf3c2d..996fbcd60 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -3,7 +3,8 @@ name: E2E Suite
 on:
   pull_request:
     branches:
-      - '*'
+      - main
+      - 'versions/**'
   push:
     branches:
       - main
@@ -40,7 +41,7 @@ jobs:
           cp -r playground "$TEST_PROJECTS_DIR"
           cp -a e2e/projects/. "$TEST_PROJECTS_DIR/"
         env:
-          TEST_PROJECTS_DIR: "${{ runner.temp }}/projects"
+          TEST_PROJECTS_DIR: '${{ runner.temp }}/projects'
 
       - name: Remove Verdaccio Storage
         run: rm -rf e2e/verdaccio-storage
@@ -52,4 +53,4 @@ jobs:
         run: TEST_PROJECTS_DIR=${{ runner.temp }}/projects yarn run "e2e:update-projects-from-private-registry"
 
       - name: Build E2E Projects
-        run: TEST_PROJECTS_DIR=${{ runner.temp }}/projects yarn run "e2e:build-projects"
\ No newline at end of file
+        run: TEST_PROJECTS_DIR=${{ runner.temp }}/projects yarn run "e2e:build-projects"
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 0e4a3fdd8..0faab491a 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @openapi-qraft/cli
 
+## 2.14.1
+
+### Patch Changes
+
+- Updated dependencies [04f84b1]
+  - @openapi-qraft/tanstack-query-react-plugin@2.14.1
+  - @openapi-qraft/plugin@2.14.1
+  - @openapi-qraft/openapi-typescript-plugin@2.14.1
+
 ## 2.14.0
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8ea8e9037..206cb3d0a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/cli",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "description": "CLI for generating typed TanStack Query React Hooks and services from OpenAPI Document, improving type safety in React apps",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
diff --git a/packages/eslint-plugin-query/CHANGELOG.md b/packages/eslint-plugin-query/CHANGELOG.md
index f3bb55f45..acb7fe2b7 100644
--- a/packages/eslint-plugin-query/CHANGELOG.md
+++ b/packages/eslint-plugin-query/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @openapi-qraft/eslint-plugin-query
 
+## 2.14.1
+
 ## 2.14.0
 
 ## 2.13.0
diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json
index 812eedb41..5d0432892 100644
--- a/packages/eslint-plugin-query/package.json
+++ b/packages/eslint-plugin-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/eslint-plugin-query",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "description": "ESLint plugin for OpenAPI Qraft",
   "homepage": "https://openapi-qraft.github.io/openapi-qraft/docs/eslint/eslint-plugin-query",
   "packageManager": "yarn@4.0.2",
diff --git a/packages/openapi-typescript-plugin/CHANGELOG.md b/packages/openapi-typescript-plugin/CHANGELOG.md
index e1a2f72da..34ccab912 100644
--- a/packages/openapi-typescript-plugin/CHANGELOG.md
+++ b/packages/openapi-typescript-plugin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @openapi-qraft/openapi-typescript
 
+## 2.14.1
+
+### Patch Changes
+
+- @openapi-qraft/plugin@2.14.1
+
 ## 2.14.0
 
 ### Patch Changes
diff --git a/packages/openapi-typescript-plugin/package.json b/packages/openapi-typescript-plugin/package.json
index 20a291b9b..ebe8daea7 100644
--- a/packages/openapi-typescript-plugin/package.json
+++ b/packages/openapi-typescript-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/openapi-typescript-plugin",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "type": "module",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
diff --git a/packages/plugin/CHANGELOG.md b/packages/plugin/CHANGELOG.md
index 227786573..d98227aad 100644
--- a/packages/plugin/CHANGELOG.md
+++ b/packages/plugin/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @openapi-qraft/plugin
 
+## 2.14.1
+
 ## 2.14.0
 
 ## 2.13.0
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 2ce4a687a..b8c64796c 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/plugin",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "packageManager": "yarn@4.0.2",
   "type": "module",
   "scripts": {
diff --git a/packages/react-client/CHANGELOG.md b/packages/react-client/CHANGELOG.md
index 0c788a718..16fdcf049 100644
--- a/packages/react-client/CHANGELOG.md
+++ b/packages/react-client/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @openapi-qraft/react
 
+## 2.14.1
+
+### Patch Changes
+
+- 04f84b1: Fix compatibility with `@tanstack/react-query@^5.100.14` by relying on TypeScript's built-in `NoInfer` type instead of importing `NoInfer` from TanStack Query.
+- Updated dependencies [04f84b1]
+  - @openapi-qraft/tanstack-query-react-types@2.14.1
+
 ## 2.14.0
 
 ### Patch Changes
diff --git a/packages/react-client/package.json b/packages/react-client/package.json
index 890d995f1..8d0a7af90 100644
--- a/packages/react-client/package.json
+++ b/packages/react-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "description": "OpenAPI client for React, providing type-safe requests and dynamic TanStack Query React Hooks via a modular, Proxy-based architecture.",
   "scripts": {
     "build": "NODE_ENV=production rollup --config rollup.config.mjs && tsc --project tsconfig.build.json --emitDeclarationOnly",
@@ -29,7 +29,7 @@
     "@openapi-qraft/rollup-config": "workspace:*",
     "@openapi-qraft/tanstack-query-react-plugin": "workspace:*",
     "@openapi-qraft/test-fixtures": "workspace:*",
-    "@tanstack/react-query": "^5.80.6",
+    "@tanstack/react-query": "^5.100.14",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
     "@types/jscodeshift": "^0.11.11",
diff --git a/packages/tanstack-query-react-plugin/CHANGELOG.md b/packages/tanstack-query-react-plugin/CHANGELOG.md
index 37a08598c..ad7b8430b 100644
--- a/packages/tanstack-query-react-plugin/CHANGELOG.md
+++ b/packages/tanstack-query-react-plugin/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @openapi-qraft/tanstack-query-react-plugin
 
+## 2.14.1
+
+### Patch Changes
+
+- 04f84b1: Fix compatibility with `@tanstack/react-query@^5.100.14` by relying on TypeScript's built-in `NoInfer` type instead of importing `NoInfer` from TanStack Query.
+  - @openapi-qraft/plugin@2.14.1
+
 ## 2.14.0
 
 ### Minor Changes
diff --git a/packages/tanstack-query-react-plugin/package.json b/packages/tanstack-query-react-plugin/package.json
index 4d18f4728..80cd92889 100644
--- a/packages/tanstack-query-react-plugin/package.json
+++ b/packages/tanstack-query-react-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/tanstack-query-react-plugin",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "type": "module",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
diff --git a/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/ApprovalPoliciesService.ts.snapshot.ts b/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/ApprovalPoliciesService.ts.snapshot.ts
index 147948016..1bf823730 100644
--- a/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/ApprovalPoliciesService.ts.snapshot.ts
+++ b/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/ApprovalPoliciesService.ts.snapshot.ts
@@ -5,7 +5,7 @@
 
 import type { paths } from "../../openapi.js";
 import type { DeepReadonly, InvalidateQueryFilters, MutationFiltersByMutationKey, MutationFiltersByParameters, MutationVariables, OperationError, OperationInfiniteData, PartialParameters, QueryFiltersByParameters, QueryFiltersByQueryKey, QueryFnOptionsByParameters, QueryFnOptionsByQueryKey, RequestFnResponse, ServiceOperationEnsureInfiniteQueryDataOptions, ServiceOperationEnsureQueryDataOptions, ServiceOperationFetchInfiniteQueryOptions, ServiceOperationFetchQueryOptions, ServiceOperationInfiniteQueryKey, ServiceOperationMutationFnOptions, ServiceOperationMutationKey, ServiceOperationQueryKey, ServiceOperationUseMutationOptions, UseQueryOptionsForUseQueries, UseQueryOptionsForUseSuspenseQuery, WithOptional, QraftServiceOperationsToken } from "@openapi-qraft/tanstack-query-react-types";
-import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, NoInfer, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
+import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
 export interface ApprovalPoliciesService {
     /**
      * @summary Get an approval policy by ID
diff --git a/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/FilesService.ts.snapshot.ts b/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/FilesService.ts.snapshot.ts
index 16f08ae44..498bd033f 100644
--- a/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/FilesService.ts.snapshot.ts
+++ b/packages/tanstack-query-react-plugin/src/__snapshots__/explicit-import-extensions/services/FilesService.ts.snapshot.ts
@@ -5,7 +5,7 @@
 
 import type { paths } from "../../openapi.js";
 import type { DeepReadonly, InvalidateQueryFilters, MutationFiltersByMutationKey, MutationFiltersByParameters, MutationVariables, OperationError, OperationInfiniteData, PartialParameters, QueryFiltersByParameters, QueryFiltersByQueryKey, QueryFnOptionsByParameters, QueryFnOptionsByQueryKey, RequestFnResponse, ServiceOperationEnsureInfiniteQueryDataOptions, ServiceOperationEnsureQueryDataOptions, ServiceOperationFetchInfiniteQueryOptions, ServiceOperationFetchQueryOptions, ServiceOperationInfiniteQueryKey, ServiceOperationMutationFnOptions, ServiceOperationMutationKey, ServiceOperationQueryKey, ServiceOperationUseMutationOptions, UseQueryOptionsForUseQueries, UseQueryOptionsForUseSuspenseQuery, WithOptional, QraftServiceOperationsToken } from "@openapi-qraft/tanstack-query-react-types";
-import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, NoInfer, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
+import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
 export interface FilesService {
     /** @summary Get a files by ID */
     getFiles: {
diff --git a/packages/tanstack-query-react-plugin/src/__snapshots__/override-import-type/services/ApprovalPoliciesService.ts.snapshot.ts b/packages/tanstack-query-react-plugin/src/__snapshots__/override-import-type/services/ApprovalPoliciesService.ts.snapshot.ts
index c7fbf684d..f8b57c4c2 100644
--- a/packages/tanstack-query-react-plugin/src/__snapshots__/override-import-type/services/ApprovalPoliciesService.ts.snapshot.ts
+++ b/packages/tanstack-query-react-plugin/src/__snapshots__/override-import-type/services/ApprovalPoliciesService.ts.snapshot.ts
@@ -5,7 +5,7 @@
 
 import type { paths } from "../../openapi.d.ts";
 import type { DeepReadonly, InvalidateQueryFilters, MutationFiltersByMutationKey, MutationFiltersByParameters, MutationVariables, OperationInfiniteData, PartialParameters, QueryFiltersByParameters, QueryFiltersByQueryKey, QueryFnOptionsByParameters, QueryFnOptionsByQueryKey, RequestFnResponse, ServiceOperationEnsureInfiniteQueryDataOptions, ServiceOperationEnsureQueryDataOptions, ServiceOperationFetchInfiniteQueryOptions, ServiceOperationFetchQueryOptions, ServiceOperationInfiniteQueryKey, ServiceOperationMutationFnOptions, ServiceOperationMutationKey, ServiceOperationQueryKey, ServiceOperationUseMutationOptions, UseQueryOptionsForUseQueries, UseQueryOptionsForUseSuspenseQuery, WithOptional, QraftServiceOperationsToken } from "@openapi-qraft/tanstack-query-react-types";
-import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, NoInfer, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult } from "@tanstack/react-query";
+import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult } from "@tanstack/react-query";
 import type { OperationError } from "../../type-overrides/operation-error.js";
 import type { UseInfiniteQueryResult } from "../../type-overrides/use-infinite-query-result.js";
 import type { UseSuspenseQueryOptions, UseSuspenseQueryResult } from "../../type-overrides/suspense-query.js";
diff --git a/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/ApprovalPoliciesService.ts.snapshot.ts b/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/ApprovalPoliciesService.ts.snapshot.ts
index f12380702..3064793ee 100644
--- a/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/ApprovalPoliciesService.ts.snapshot.ts
+++ b/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/ApprovalPoliciesService.ts.snapshot.ts
@@ -5,7 +5,7 @@
 
 import type { paths } from "../../openapi.d.ts";
 import type { DeepReadonly, InvalidateQueryFilters, MutationFiltersByMutationKey, MutationFiltersByParameters, MutationVariables, OperationError, OperationInfiniteData, PartialParameters, QueryFiltersByParameters, QueryFiltersByQueryKey, QueryFnOptionsByParameters, QueryFnOptionsByQueryKey, RequestFnResponse, ServiceOperationEnsureInfiniteQueryDataOptions, ServiceOperationEnsureQueryDataOptions, ServiceOperationFetchInfiniteQueryOptions, ServiceOperationFetchQueryOptions, ServiceOperationInfiniteQueryKey, ServiceOperationMutationFnOptions, ServiceOperationMutationKey, ServiceOperationQueryKey, ServiceOperationUseMutationOptions, UseQueryOptionsForUseQueries, UseQueryOptionsForUseSuspenseQuery, WithOptional, QraftServiceOperationsToken } from "@openapi-qraft/tanstack-query-react-types";
-import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, NoInfer, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
+import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
 export interface ApprovalPoliciesService {
     /**
      * @summary Get an approval policy by ID
diff --git a/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/FilesService.ts.snapshot.ts b/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/FilesService.ts.snapshot.ts
index 62944e023..ac3d06a15 100644
--- a/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/FilesService.ts.snapshot.ts
+++ b/packages/tanstack-query-react-plugin/src/__snapshots__/queryable-write-operations/services/FilesService.ts.snapshot.ts
@@ -5,7 +5,7 @@
 
 import type { paths } from "../../openapi.d.ts";
 import type { DeepReadonly, InvalidateQueryFilters, MutationFiltersByMutationKey, MutationFiltersByParameters, MutationVariables, OperationError, OperationInfiniteData, PartialParameters, QueryFiltersByParameters, QueryFiltersByQueryKey, QueryFnOptionsByParameters, QueryFnOptionsByQueryKey, RequestFnResponse, ServiceOperationEnsureInfiniteQueryDataOptions, ServiceOperationEnsureQueryDataOptions, ServiceOperationFetchInfiniteQueryOptions, ServiceOperationFetchQueryOptions, ServiceOperationInfiniteQueryKey, ServiceOperationMutationFnOptions, ServiceOperationMutationKey, ServiceOperationQueryKey, ServiceOperationUseMutationOptions, UseQueryOptionsForUseQueries, UseQueryOptionsForUseSuspenseQuery, WithOptional, QraftServiceOperationsToken } from "@openapi-qraft/tanstack-query-react-types";
-import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, NoInfer, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
+import type { CancelOptions, DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationCache, MutationState, QueryState, RefetchOptions, ResetOptions, SetDataOptions, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseInfiniteQueryResult, UseMutationResult, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from "@tanstack/react-query";
 export interface FilesService {
     /** @summary Get a files by ID */
     getFiles: {
diff --git a/packages/tanstack-query-react-types/CHANGELOG.md b/packages/tanstack-query-react-types/CHANGELOG.md
index 358d4a9e1..dd2f85434 100644
--- a/packages/tanstack-query-react-types/CHANGELOG.md
+++ b/packages/tanstack-query-react-types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @openapi-qraft/tanstack-query-react-types
 
+## 2.14.1
+
+### Patch Changes
+
+- 04f84b1: Fix compatibility with `@tanstack/react-query@^5.100.14` by relying on TypeScript's built-in `NoInfer` type instead of importing `NoInfer` from TanStack Query.
+
 ## 2.14.0
 
 ## 2.13.0
diff --git a/packages/tanstack-query-react-types/package.json b/packages/tanstack-query-react-types/package.json
index ce0c443d8..0198e1b89 100644
--- a/packages/tanstack-query-react-types/package.json
+++ b/packages/tanstack-query-react-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/tanstack-query-react-types",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "scripts": {
     "build": "yarn clean && NODE_ENV=production rollup --config rollup.config.mjs && tsc --project tsconfig.build.json --emitDeclarationOnly",
     "dev": "yarn clean && tsc --project tsconfig.build.json --watch --outDir ./dist/esm --noEmitOnError false",
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@openapi-qraft/eslint-config": "workspace:*",
     "@openapi-qraft/rollup-config": "workspace:*",
-    "@tanstack/react-query": "^5.80.6",
+    "@tanstack/react-query": "^5.100.14",
     "eslint": "^9.39.1",
     "rimraf": "^6.1.2",
     "rollup": "~4.22.5",
diff --git a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationGetQueriesData.ts b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationGetQueriesData.ts
index 4665a8999..bf8d9817d 100644
--- a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationGetQueriesData.ts
+++ b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationGetQueriesData.ts
@@ -5,7 +5,6 @@ import type {
   ServiceOperationInfiniteQueryKey,
   ServiceOperationQueryKey,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { NoInfer } from '@tanstack/react-query';
 
 export interface ServiceOperationGetQueriesData<
   TSchema extends { url: string; method: string },
diff --git a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetInfiniteQueryData.ts b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetInfiniteQueryData.ts
index e94c787fd..303c488cc 100644
--- a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetInfiniteQueryData.ts
+++ b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetInfiniteQueryData.ts
@@ -4,7 +4,7 @@ import type {
   OperationInfiniteData,
   ServiceOperationInfiniteQueryKey,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { NoInfer, SetDataOptions, Updater } from '@tanstack/react-query';
+import type { SetDataOptions, Updater } from '@tanstack/react-query';
 
 export interface ServiceOperationSetInfiniteQueryData<
   TSchema extends { url: string; method: string },
diff --git a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueriesData.ts b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueriesData.ts
index ea0d4e2ce..734e8fee6 100644
--- a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueriesData.ts
+++ b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueriesData.ts
@@ -2,7 +2,7 @@ import type {
   QueryFiltersByParameters,
   QueryFiltersByQueryKey,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { NoInfer, SetDataOptions, Updater } from '@tanstack/react-query';
+import type { SetDataOptions, Updater } from '@tanstack/react-query';
 
 export interface ServiceOperationSetQueriesData<
   TSchema extends { url: string; method: string },
diff --git a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueryData.ts b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueryData.ts
index c9a7ac4ce..ce8aa8d27 100644
--- a/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueryData.ts
+++ b/packages/tanstack-query-react-types/src/service-operation/ServiceOperationSetQueryData.ts
@@ -3,7 +3,7 @@ import type {
   DeepReadonly,
   ServiceOperationQueryKey,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { NoInfer, SetDataOptions, Updater } from '@tanstack/react-query';
+import type { SetDataOptions, Updater } from '@tanstack/react-query';
 
 export interface ServiceOperationSetQueryData<
   TSchema extends { url: string; method: string },
diff --git a/yarn.lock b/yarn.lock
index 6dec7c4ca..c004247da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4150,7 +4150,7 @@ __metadata:
     "@openapi-qraft/tanstack-query-react-plugin": "workspace:*"
     "@openapi-qraft/tanstack-query-react-types": "workspace:*"
     "@openapi-qraft/test-fixtures": "workspace:*"
-    "@tanstack/react-query": "npm:^5.80.6"
+    "@tanstack/react-query": "npm:^5.100.14"
     "@testing-library/dom": "npm:^10.4.0"
     "@testing-library/react": "npm:^16.2.0"
     "@types/jscodeshift": "npm:^0.11.11"
@@ -4222,7 +4222,7 @@ __metadata:
   dependencies:
     "@openapi-qraft/eslint-config": "workspace:*"
     "@openapi-qraft/rollup-config": "workspace:*"
-    "@tanstack/react-query": "npm:^5.80.6"
+    "@tanstack/react-query": "npm:^5.100.14"
     eslint: "npm:^9.39.1"
     rimraf: "npm:^6.1.2"
     rollup: "npm:~4.22.5"
@@ -5242,21 +5242,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:5.80.6":
-  version: 5.80.6
-  resolution: "@tanstack/query-core@npm:5.80.6"
-  checksum: 10c0/ce52d962036bf84845c9dafb654075bbc8eafd9236069b7c234b7f72a30e4e61daf222940d9f28b4359858277cc1e1d08dd1f8e6cc0adac72acc083fc5c0195c
+"@tanstack/query-core@npm:5.100.14":
+  version: 5.100.14
+  resolution: "@tanstack/query-core@npm:5.100.14"
+  checksum: 10c0/947942b1499169b279faf4eddd570719db5d6863c89db4ec2d54e1eb3fb66a679cfa87a15c9f2e9d5de523e4bcc1782c020fba913ead461b73ecec4fdd986c59
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:^5.80.6":
-  version: 5.80.6
-  resolution: "@tanstack/react-query@npm:5.80.6"
+"@tanstack/react-query@npm:^5.100.14":
+  version: 5.100.14
+  resolution: "@tanstack/react-query@npm:5.100.14"
   dependencies:
-    "@tanstack/query-core": "npm:5.80.6"
+    "@tanstack/query-core": "npm:5.100.14"
   peerDependencies:
     react: ^18 || ^19
-  checksum: 10c0/ec2dc548ff28d92778e851d64b0c24e3289218b496694c0b7bed1e92b5b96b03f8b047d4a8a04c6924937c56e257d53fbe42e046745da10d9dababe48505f843
+  checksum: 10c0/f124e7671f5731a88241a71a6ce7da54f0bafb960ec4107d1eb24d0fc25136d10cd02ebd68956eb0605a29e60d925e82bfb52386b25cbe2e1cb4c166017cbf2a
   languageName: node
   linkType: hard