diff --git a/package-lock.json b/package-lock.json
index 1ff2d928a..bbd2ddd0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2699,6 +2699,16 @@
         "@types/lodash": "*"
       }
     },
+    "node_modules/@frinxio/gamma/node_modules/@types/react": {
+      "version": "17.0.83",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+      "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
+      "dependencies": {
+        "@types/prop-types": "*",
+        "@types/scheduler": "^0.16",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/@frinxio/gamma/node_modules/@types/uuid": {
       "version": "8.3.4",
       "license": "MIT"
@@ -4936,11 +4946,11 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "17.0.65",
-      "license": "MIT",
+      "version": "18.3.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.10.tgz",
+      "integrity": "sha512-02sAAlBnP39JgXwkAq3PeU9DVaaGpZyF3MGcC0MKgQVkZor5IiiDAipVaxQHtDJAmO4GIy/rVBy/LzVj76Cyqg==",
       "dependencies": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
@@ -6631,6 +6641,16 @@
         "@types/lodash": "*"
       }
     },
+    "node_modules/chakra-ui-autocomplete/node_modules/@types/react": {
+      "version": "17.0.83",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+      "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
+      "dependencies": {
+        "@types/prop-types": "*",
+        "@types/scheduler": "^0.16",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/chakra-ui-autocomplete/node_modules/framesync": {
       "version": "5.3.0",
       "license": "MIT",
@@ -18790,7 +18810,7 @@
         "@frinx/workflow-builder": "^2.0.0",
         "@frinx/workflow-ui": "^2.0.0",
         "@frinxio/gamma": "7.0.0",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@types/react-dom": "18.2.7",
         "eventemitter3": "5.0.1",
         "feather-icons-react": "0.6.2",
@@ -18834,7 +18854,7 @@
       "version": "2.0.0",
       "dependencies": {
         "@frinx/shared": "^2.0.0",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "chakra-ui-autocomplete": "^1.4.5",
         "date-fns": "^2.29.3",
         "feather-icons-react": "0.6.2",
@@ -18860,7 +18880,7 @@
         "@graphql-codegen/typescript": "4.0.1",
         "@graphql-codegen/typescript-operations": "4.0.1",
         "@types/leaflet": "^1.9.12",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
         "eslint": "8.50.0",
@@ -18919,7 +18939,7 @@
       "dependencies": {
         "@frinx/shared": "^2.0.0",
         "@types/json-templates": "3.0.0",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "chakra-ui-autocomplete": "^1.4.5",
         "date-fns": "^2.29.3",
         "date-fns-tz": "2.0.0",
@@ -18995,7 +19015,7 @@
         "@graphql-codegen/introspection": "4.0.0",
         "@graphql-codegen/typescript": "4.0.1",
         "@graphql-codegen/typescript-operations": "4.0.1",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
         "eslint": "8.50.0",
@@ -19028,7 +19048,7 @@
       "dependencies": {
         "@frinx/shared": "^2.0.0",
         "@types/file-saver": "2.0.5",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@urql/exchange-retry": "1.2.0",
         "dagre": "0.8.5",
         "feather-icons-react": "0.6.2",
@@ -19160,7 +19180,7 @@
         "@emotion/styled": "11.11.0",
         "@frinx/build-scripts": "^2.0.0",
         "@frinx/eslint-config-typescript": "20.0.1",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
         "eslint": "8.50.0",
@@ -20899,7 +20919,7 @@
         "@frinx/workflow-builder": "^2.0.0",
         "@frinx/workflow-ui": "^2.0.0",
         "@frinxio/gamma": "7.0.0",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@types/react-dom": "18.2.7",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
@@ -20944,7 +20964,7 @@
         "@graphql-codegen/typescript": "4.0.1",
         "@graphql-codegen/typescript-operations": "4.0.1",
         "@types/leaflet": "^1.9.12",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
         "chakra-ui-autocomplete": "^1.4.5",
@@ -21042,7 +21062,7 @@
         "@graphql-codegen/typescript-operations": "4.0.1",
         "@types/json-templates": "3.0.0",
         "@types/leaflet": "^1.9.12",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@types/xterm": "^3.0.0",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
@@ -21088,7 +21108,7 @@
         "@graphql-codegen/introspection": "4.0.0",
         "@graphql-codegen/typescript": "4.0.1",
         "@graphql-codegen/typescript-operations": "4.0.1",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
         "eslint": "8.50.0",
@@ -21122,7 +21142,7 @@
         "@frinx/build-scripts": "^2.0.0",
         "@frinx/eslint-config-typescript": "20.0.1",
         "@monaco-editor/react": "^4.5.1",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@types/uuid": "9.0.4",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
@@ -21197,7 +21217,7 @@
         "@graphql-codegen/typescript-operations": "4.0.1",
         "@types/dagre": "0.7.49",
         "@types/file-saver": "2.0.5",
-        "@types/react": "17.0.65",
+        "@types/react": "18.3.10",
         "@typescript-eslint/eslint-plugin": "6.7.2",
         "@typescript-eslint/parser": "6.7.2",
         "@urql/exchange-retry": "1.2.0",
@@ -21328,6 +21348,16 @@
             "@types/lodash": "*"
           }
         },
+        "@types/react": {
+          "version": "17.0.83",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+          "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
+          "requires": {
+            "@types/prop-types": "*",
+            "@types/scheduler": "^0.16",
+            "csstype": "^3.0.2"
+          }
+        },
         "@types/uuid": {
           "version": "8.3.4"
         },
@@ -22900,10 +22930,11 @@
       "version": "1.2.5"
     },
     "@types/react": {
-      "version": "17.0.65",
+      "version": "18.3.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.10.tgz",
+      "integrity": "sha512-02sAAlBnP39JgXwkAq3PeU9DVaaGpZyF3MGcC0MKgQVkZor5IiiDAipVaxQHtDJAmO4GIy/rVBy/LzVj76Cyqg==",
       "requires": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
@@ -23967,6 +23998,16 @@
             "@types/lodash": "*"
           }
         },
+        "@types/react": {
+          "version": "17.0.83",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+          "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
+          "requires": {
+            "@types/prop-types": "*",
+            "@types/scheduler": "^0.16",
+            "csstype": "^3.0.2"
+          }
+        },
         "framesync": {
           "version": "5.3.0",
           "requires": {
diff --git a/packages/frinx-dashboard/package.json b/packages/frinx-dashboard/package.json
index 0a61afc83..3d1ede690 100644
--- a/packages/frinx-dashboard/package.json
+++ b/packages/frinx-dashboard/package.json
@@ -17,7 +17,7 @@
     "@frinx/workflow-builder": "^2.0.0",
     "@frinx/workflow-ui": "^2.0.0",
     "@frinxio/gamma": "7.0.0",
-    "@types/react": "17.0.65",
+    "@types/react": "18.3.10",
     "@types/react-dom": "18.2.7",
     "eventemitter3": "5.0.1",
     "feather-icons-react": "0.6.2",
diff --git a/packages/frinx-device-topology/package.json b/packages/frinx-device-topology/package.json
index 7a0597c6d..1195a56a2 100644
--- a/packages/frinx-device-topology/package.json
+++ b/packages/frinx-device-topology/package.json
@@ -30,7 +30,7 @@
     "@graphql-codegen/typescript": "4.0.1",
     "@graphql-codegen/typescript-operations": "4.0.1",
     "@types/leaflet": "^1.9.12",
-    "@types/react": "17.0.65",
+    "@types/react": "18.3.10",
     "@typescript-eslint/eslint-plugin": "6.7.2",
     "@typescript-eslint/parser": "6.7.2",
     "eslint": "8.50.0",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@frinx/shared": "^2.0.0",
-    "@types/react": "17.0.65",
+    "@types/react": "18.3.10",
     "chakra-ui-autocomplete": "^1.4.5",
     "date-fns": "^2.29.3",
     "feather-icons-react": "0.6.2",
diff --git a/packages/frinx-inventory-client/package.json b/packages/frinx-inventory-client/package.json
index 7c7e153fb..420f06349 100644
--- a/packages/frinx-inventory-client/package.json
+++ b/packages/frinx-inventory-client/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@frinx/shared": "^2.0.0",
     "@types/json-templates": "3.0.0",
-    "@types/react": "17.0.65",
+    "@types/react": "18.3.10",
     "chakra-ui-autocomplete": "^1.4.5",
     "date-fns": "^2.29.3",
     "date-fns-tz": "2.0.0",
diff --git a/packages/frinx-resource-manager/package.json b/packages/frinx-resource-manager/package.json
index ed256fdc0..1f94e491c 100644
--- a/packages/frinx-resource-manager/package.json
+++ b/packages/frinx-resource-manager/package.json
@@ -37,7 +37,7 @@
     "@graphql-codegen/introspection": "4.0.0",
     "@graphql-codegen/typescript": "4.0.1",
     "@graphql-codegen/typescript-operations": "4.0.1",
-    "@types/react": "17.0.65",
+    "@types/react": "18.3.10",
     "@typescript-eslint/eslint-plugin": "6.7.2",
     "@typescript-eslint/parser": "6.7.2",
     "eslint": "8.50.0",
diff --git a/packages/frinx-workflow-builder/package.json b/packages/frinx-workflow-builder/package.json
index 90eabbf0c..117f93448 100644
--- a/packages/frinx-workflow-builder/package.json
+++ b/packages/frinx-workflow-builder/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@frinx/shared": "^2.0.0",
     "@types/file-saver": "2.0.5",
-    "@types/react": "17.0.65",
+    "@types/react": "18.3.10",
     "@urql/exchange-retry": "1.2.0",
     "dagre": "0.8.5",
     "feather-icons-react": "0.6.2",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 5e4122b5c..0bbea6459 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -23,7 +23,7 @@
     "@emotion/styled": "11.11.0",
     "@frinx/build-scripts": "^2.0.0",
     "@frinx/eslint-config-typescript": "20.0.1",
-    "@types/react": "17.0.65",
+    "@types/react": "18.3.10",
     "@typescript-eslint/eslint-plugin": "6.7.2",
     "@typescript-eslint/parser": "6.7.2",
     "eslint": "8.50.0",