diff --git a/package.json b/package.json
index 5eb041b26c..b3485ad89c 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.14.2-pre-3",
+        "@devtron-labs/devtron-fe-common-lib": "1.14.2-beta-0",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -91,6 +91,7 @@
         "@types/node": "20.11.0",
         "@types/react": "17.0.39",
         "@types/react-csv": "^1.1.3",
+        "@types/react-dates": "^21.8.6",
         "@types/react-dom": "17.0.13",
         "@types/react-router-dom": "^5.3.3",
         "@types/react-transition-group": "^4.4.4",
diff --git a/src/index.tsx b/src/index.tsx
index 3e66481667..200d6a6ce8 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -29,6 +29,7 @@ import {
     ThemeProvider,
     ConfirmationModalProvider,
     BaseConfirmationModal,
+    QueryClientProvider,
 } from '@devtron-labs/devtron-fe-common-lib'
 import App from './App'
 
@@ -180,19 +181,21 @@ if (!window || !window._env_) {
 ReactDOM.render(
     <React.StrictMode>
         {window.top === window.self ? (
-            <ThemeProvider>
-                <BrowserRouter basename={window.__BASE_URL__}>
-                    <UseRegisterShortcutProvider>
-                        <UserEmailProvider>
-                            <ConfirmationModalProvider>
-                                <App />
-                                <BaseConfirmationModal />
-                            </ConfirmationModalProvider>
-                        </UserEmailProvider>
-                    </UseRegisterShortcutProvider>
-                    <ToastManagerContainer />
-                </BrowserRouter>
-            </ThemeProvider>
+            <QueryClientProvider>
+                <ThemeProvider>
+                    <BrowserRouter basename={window.__BASE_URL__}>
+                        <UseRegisterShortcutProvider>
+                            <UserEmailProvider>
+                                <ConfirmationModalProvider>
+                                    <App />
+                                    <BaseConfirmationModal />
+                                </ConfirmationModalProvider>
+                            </UserEmailProvider>
+                        </UseRegisterShortcutProvider>
+                        <ToastManagerContainer />
+                    </BrowserRouter>
+                </ThemeProvider>
+            </QueryClientProvider>
         ) : null}
     </React.StrictMode>,
     root,
diff --git a/yarn.lock b/yarn.lock
index 6eb1a81ba3..ca5f6b74a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1124,10 +1124,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/devtron-fe-common-lib@1.14.2-pre-3":
-  version "1.14.2-pre-3"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.2-pre-3.tgz#b60864f9df69fe2459990e13f3251cea7d7bb6d0"
-  integrity sha512-GooRFGblceF0/2kfrOvR6neB0EWN61UEkMVE/YMzOzT9Z2pWnxL3vsaNXqGIEmp8nwVyCffdpC6UBiEzDGc04Q==
+"@devtron-labs/devtron-fe-common-lib@1.14.2-beta-0":
+  version "1.14.2-beta-0"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.2-beta-0.tgz#42a482c9c6717f936dec54bd15e9033d986d5b20"
+  integrity sha512-3ZRdpqFz9ge3e+g7KHcQiS8DwtPjJOyC0A0zWRSp25Hc+xUzbuSd0td9c1Mu3LrTHQPg15Fc7WsPTgPaiHhVyg==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"
@@ -1139,7 +1139,7 @@
     "@lezer/highlight" "1.2.1"
     "@replit/codemirror-indentation-markers" "6.5.3"
     "@replit/codemirror-vscode-keymap" "6.0.2"
-    "@types/react-dates" "^21.8.6"
+    "@tanstack/react-query" "<5"
     "@uiw/codemirror-extensions-hyper-link" "4.23.10"
     "@uiw/codemirror-theme-github" "4.23.7"
     "@uiw/react-codemirror" "4.23.7"
@@ -2643,6 +2643,19 @@
     "@svgr/hast-util-to-babel-ast" "^6.5.1"
     svg-parser "^2.0.4"
 
+"@tanstack/query-core@4.39.1":
+  version "4.39.1"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.39.1.tgz#61d706275f2e4ea3ed3ed3b95a0117a99bc94317"
+  integrity sha512-E1g5oEiBq8l1xU1ELXieEBD55oZQscn4kaHidsxdCH1egAk9Tx4sTi8rgQiayoaEWESOurRdDEf2wJHp9/BRDg==
+
+"@tanstack/react-query@<5":
+  version "4.39.1"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.39.1.tgz#9d63e432f5c877f0e39d1d18a8ee0b29be12f762"
+  integrity sha512-eV8PchGpgqE5OMQ5LEfYmgwdKI3uZLSXekfkCpqvLNExE1bDFsPL1zFlFid5CSe7gf2zGju00PnsBoJcEBUJMw==
+  dependencies:
+    "@tanstack/query-core" "4.39.1"
+    use-sync-external-store "^1.2.0"
+
 "@testing-library/dom@10.4.0":
   version "10.4.0"
   resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz"
@@ -8726,7 +8739,7 @@ use-isomorphic-layout-effect@^1.1.2:
   resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz"
   integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
 
-use-sync-external-store@^1.2.2:
+use-sync-external-store@^1.2.0, use-sync-external-store@^1.2.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz#55122e2a3edd2a6c106174c27485e0fd59bcfca0"
   integrity sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==