diff --git a/common/changes/@xarc/react-query/update-react-query_2024-10-22-13-00.json b/common/changes/@xarc/react-query/update-react-query_2024-10-22-13-00.json
deleted file mode 100644
index 640351dd6..000000000
--- a/common/changes/@xarc/react-query/update-react-query_2024-10-22-13-00.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@xarc/react-query",
-      "comment": "update react query to @tanstack/react-query",
-      "type": "major"
-    }
-  ],
-  "packageName": "@xarc/react-query"
-}
\ No newline at end of file
diff --git a/common/changes/subapp-redux/fix-deprecated_createstore_2024-09-26-16-32.json b/common/changes/subapp-redux/fix-deprecated_createstore_2024-09-26-16-32.json
deleted file mode 100644
index 241c4adef..000000000
--- a/common/changes/subapp-redux/fix-deprecated_createstore_2024-09-26-16-32.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "subapp-redux",
-      "comment": "replace createStore of redux by configureStore of @reduxjs/toolkit",
-      "type": "major"
-    }
-  ],
-  "packageName": "subapp-redux"
-}
\ No newline at end of file
diff --git a/packages/subapp-redux/CHANGELOG.json b/packages/subapp-redux/CHANGELOG.json
index aaeadd32a..1213e567b 100644
--- a/packages/subapp-redux/CHANGELOG.json
+++ b/packages/subapp-redux/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "subapp-redux",
   "entries": [
+    {
+      "version": "3.0.0",
+      "tag": "subapp-redux_v3.0.0",
+      "date": "Fri, 25 Oct 2024 17:22:04 GMT",
+      "comments": {
+        "major": [
+          {
+            "comment": "Upgrade internal implementation to use @reduxjs/toolkit"
+          }
+        ]
+      }
+    },
     {
       "version": "2.3.0",
       "tag": "subapp-redux_v2.3.0",
diff --git a/packages/subapp-redux/CHANGELOG.md b/packages/subapp-redux/CHANGELOG.md
index 639e7db79..7f8d16514 100644
--- a/packages/subapp-redux/CHANGELOG.md
+++ b/packages/subapp-redux/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - subapp-redux
 
-This log was last generated on Fri, 19 Apr 2024 20:43:30 GMT and should not be manually modified.
+This log was last generated on Fri, 25 Oct 2024 17:22:04 GMT and should not be manually modified.
+
+## 3.0.0
+Fri, 25 Oct 2024 17:22:04 GMT
+
+### Breaking changes
+
+- Upgrade internal implementation to use @reduxjs/toolkit
 
 ## 2.3.0
 Fri, 19 Apr 2024 20:43:30 GMT
diff --git a/packages/subapp-redux/package.json b/packages/subapp-redux/package.json
index 798068d65..ce9423c45 100644
--- a/packages/subapp-redux/package.json
+++ b/packages/subapp-redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "subapp-redux",
-  "version": "2.3.0",
+  "version": "3.0.0",
   "description": "Electrode subapp redux support",
   "module": "dist/dev/index.js",
   "main": "lib/index.js",
@@ -38,6 +38,7 @@
     "@babel/preset-react": "^7.16.7",
     "@babel/register": "^7.17.7",
     "@babel/runtime": "^7.17.9",
+    "@reduxjs/toolkit": ">= 2",
     "@xarc/run": "^1.1.1",
     "babel-preset-minify": "^0.5.1",
     "electrode-archetype-njs-module-dev": "^3.0.3",
@@ -45,8 +46,7 @@
     "react-dom": "^18.2.0",
     "react-redux": "^8.0.1",
     "run-verify": "^1.2.6",
-    "subapp-pkg-util": "0.0.1",
-    "@reduxjs/toolkit": ">= 2"
+    "subapp-pkg-util": "0.0.1"
   },
   "peerDependencies": {
     "react": "*",
@@ -80,4 +80,4 @@
     "lines": 10,
     "cache": true
   }
-}
\ No newline at end of file
+}
diff --git a/packages/xarc-create-app/package.json b/packages/xarc-create-app/package.json
index 29e22ca1f..b20aac5d8 100644
--- a/packages/xarc-create-app/package.json
+++ b/packages/xarc-create-app/package.json
@@ -39,7 +39,7 @@
     "@xarc/app-dev": "^11.0.10",
     "@xarc/module-dev": "^2.2.4",
     "@xarc/react": "^1.0.6",
-    "@xarc/react-query": "^1.0.7",
+    "@xarc/react-query": "^2.0.0",
     "@xarc/react-redux": "^2.0.0",
     "babel-loader": "^9.1.3",
     "chai": "^4.2.0",
diff --git a/packages/xarc-react-query/CHANGELOG.json b/packages/xarc-react-query/CHANGELOG.json
index 43c0a3b25..2a7f36a48 100644
--- a/packages/xarc-react-query/CHANGELOG.json
+++ b/packages/xarc-react-query/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@xarc/react-query",
   "entries": [
+    {
+      "version": "2.0.0",
+      "tag": "@xarc/react-query_v2.0.0",
+      "date": "Fri, 25 Oct 2024 17:22:04 GMT",
+      "comments": {
+        "major": [
+          {
+            "comment": "update react query to @tanstack/react-query"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.7",
       "tag": "@xarc/react-query_v1.0.7",
diff --git a/packages/xarc-react-query/CHANGELOG.md b/packages/xarc-react-query/CHANGELOG.md
index f35487c81..ac3a78a08 100644
--- a/packages/xarc-react-query/CHANGELOG.md
+++ b/packages/xarc-react-query/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @xarc/react-query
 
-This log was last generated on Fri, 06 Sep 2024 17:12:11 GMT and should not be manually modified.
+This log was last generated on Fri, 25 Oct 2024 17:22:04 GMT and should not be manually modified.
+
+## 2.0.0
+Fri, 25 Oct 2024 17:22:04 GMT
+
+### Breaking changes
+
+- update react query to @tanstack/react-query
 
 ## 1.0.7
 Fri, 06 Sep 2024 17:12:11 GMT
diff --git a/packages/xarc-react-query/package.json b/packages/xarc-react-query/package.json
index 556155c68..ae6eb2281 100644
--- a/packages/xarc-react-query/package.json
+++ b/packages/xarc-react-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xarc/react-query",
-  "version": "1.0.7",
+  "version": "2.0.0",
   "description": "xarc React.js application react-query support",
   "main": "dist-node-cjs/node/index.js",
   "module": "dist-node-esm/node/index.js",
@@ -24,9 +24,9 @@
     "react-dom": "*"
   },
   "dependencies": {
+    "@tanstack/react-query": "^5.59.15",
     "@xarc/subapp": "^0.4.2",
-    "tslib": "^2.4.0",
-    "@tanstack/react-query": "^5.59.15"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.11.0",
@@ -118,4 +118,4 @@
     ],
     "recursive": true
   }
-}
\ No newline at end of file
+}
diff --git a/samples/poc-subapp-redux/package.json b/samples/poc-subapp-redux/package.json
index e93e7c753..2b855c0c8 100644
--- a/samples/poc-subapp-redux/package.json
+++ b/samples/poc-subapp-redux/package.json
@@ -51,7 +51,7 @@
     "redux": "^4.2.0",
     "redux-logger": "^3.0.6",
     "subapp-react": "^1.3.0",
-    "subapp-redux": "^2.3.0",
+    "subapp-redux": "^3.0.0",
     "subapp-server": "^2.4.2",
     "subapp-web": "^2.1.6",
     "@reduxjs/toolkit": ">= 2"
@@ -65,4 +65,4 @@
   "prettier": {
     "printWidth": 100
   }
-}
\ No newline at end of file
+}
diff --git a/samples/poc-subapp/package.json b/samples/poc-subapp/package.json
index c66c55971..6e036fc4f 100644
--- a/samples/poc-subapp/package.json
+++ b/samples/poc-subapp/package.json
@@ -51,7 +51,7 @@
     "react-router-dom": "^6.23.1",
     "redux": "^4.2.1",
     "subapp-react": "^1.3.0",
-    "subapp-redux": "^2.3.0",
+    "subapp-redux": "^3.0.0",
     "subapp-server": "^2.4.2",
     "subapp-web": "^2.1.6"
   },
diff --git a/samples/poc-subappv1-csp/package.json b/samples/poc-subappv1-csp/package.json
index 75a4c7bb9..d990693f6 100644
--- a/samples/poc-subappv1-csp/package.json
+++ b/samples/poc-subappv1-csp/package.json
@@ -49,7 +49,7 @@
     "react-router-dom": "^6.23.1",
     "redux": "^4.2.1",
     "subapp-react": "^1.3.0",
-    "subapp-redux": "^2.3.0",
+    "subapp-redux": "^3.0.0",
     "subapp-server": "^2.4.2",
     "subapp-web": "^2.1.6",
     "crypto": "^1.0.1"
diff --git a/samples/subapp2-basic/package.json b/samples/subapp2-basic/package.json
index 7ebc72711..6ae1e8e81 100644
--- a/samples/subapp2-basic/package.json
+++ b/samples/subapp2-basic/package.json
@@ -36,7 +36,7 @@
     "@xarc/fastify-server": "^3.3.0",
     "@xarc/app": "^11.0.10",
     "@xarc/react": "^1.0.6",
-    "@xarc/react-query": "^1.0.7",
+    "@xarc/react-query": "^2.0.0",
     "@xarc/react-redux": "^2.0.0",
     "@xarc/react-router": "^1.1.6",
     "@module-federation/concat-runtime": "~0.0.1"
diff --git a/samples/subapp2-poc/package.json b/samples/subapp2-poc/package.json
index 336d8fb40..8690cd1b6 100644
--- a/samples/subapp2-poc/package.json
+++ b/samples/subapp2-poc/package.json
@@ -34,7 +34,7 @@
     "@xarc/app": "^11.0.10",
     "@xarc/fastify-server": "^3.3.0",
     "@xarc/react": "^1.0.6",
-    "@xarc/react-query": "^1.0.7",
+    "@xarc/react-query": "^2.0.0",
     "@xarc/react-recoil": "^1.1.6",
     "@xarc/react-redux": "^2.0.0",
     "@xarc/react-router": "^1.1.6",