diff --git a/Dockerfile b/Dockerfile
index f25f2e13..e9cf5975 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# docker build -t ff .
+# docker run -p 3000:3000 -it ff
 # Build stage
 FROM quay.io/cdis/ubuntu:20.04 AS builder
 
diff --git a/package-lock.json b/package-lock.json
index 62b5758b..5d62f5d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,8 +26,8 @@
         "cookies-next": "4.3.0",
         "isomorphic-fetch": "^3.0.0",
         "jsonpath-plus": "^10.2.0",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "react-responsive-carousel": "^3.2.23",
         "url-join": "^5.0.0"
       },
@@ -43,7 +43,7 @@
         "@testing-library/react": "^14.1.2",
         "@types/jest": "^29.5.13",
         "@types/node": "22.7.2",
-        "@types/react": "^18.2.21",
+        "@types/react": "^18.3.18",
         "@typescript-eslint/eslint-plugin": "^8.7.0",
         "@typescript-eslint/parser": "^8.7.0",
         "autoprefixer": "^10.4.20",
@@ -7659,7 +7659,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "18.3.9",
+      "version": "18.3.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
+      "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
       "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
@@ -34014,9 +34016,9 @@
         "npm": ">=10.8.2"
       },
       "peerDependencies": {
-        "react": "^18.2.0",
+        "react": "^18.3.1",
         "react-cookie": "^7.2.2",
-        "react-dom": "^18.2.0"
+        "react-dom": "^18.3.1"
       }
     },
     "packages/core/node_modules/@reduxjs/toolkit": {
@@ -34167,8 +34169,8 @@
         "@types/mdx": "^2.0.3",
         "@types/node": "18.15.5",
         "@types/pluralize": "^0.0.33",
-        "@types/react": "^18.2.21",
-        "@types/react-dom": "^18.2.7",
+        "@types/react": "^18.3.18",
+        "@types/react-dom": "^18.3.5",
         "@types/react-table": "^7.7.15",
         "@types/recharts": "^1.8.29",
         "@types/tinycolor2": "^1.4.4",
@@ -34188,8 +34190,8 @@
       },
       "peerDependencies": {
         "@gen3/core": "^0.10.68",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "tailwindcss": "^3.4.16"
       }
     },
@@ -34448,6 +34450,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "packages/frontend/node_modules/@types/react-dom": {
+      "version": "18.3.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
+      "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^18.0.0"
+      }
+    },
     "packages/frontend/node_modules/immer": {
       "version": "10.1.1",
       "license": "MIT",
@@ -34632,14 +34644,14 @@
         "@gen3/toolsff": "file:../tools",
         "@next/mdx": "^14.2.15",
         "@types/mdx": "^2.0.13",
-        "@types/react": "^18.2.21",
-        "@types/react-dom": "^18.2.7",
+        "@types/react": "^18.3.18",
+        "@types/react-dom": "^18.3.5",
         "@welldone-software/why-did-you-render": "^8.0.3",
         "next": "^14.2.15",
         "postcss-import": "^16.1.0",
         "postcss-preset-mantine": "^1.17.0",
-        "react": "^18.2.0",
-        "react-dom": "18.2.0"
+        "react": "^18.3.1",
+        "react-dom": "18.3.1"
       },
       "peerDependencies": {
         "tailwindcss": "^3.4.16",
@@ -34921,6 +34933,16 @@
         "@types/unist": "*"
       }
     },
+    "packages/sampleCommons/node_modules/@types/react-dom": {
+      "version": "18.3.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
+      "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^18.0.0"
+      }
+    },
     "packages/sampleCommons/node_modules/@types/unist": {
       "version": "3.0.3",
       "license": "MIT"
diff --git a/package.json b/package.json
index a434ac8e..a36cd301 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
     "classnames": "^2.3.1",
     "colorette": "^2.0.20",
     "isomorphic-fetch": "^3.0.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-responsive-carousel": "^3.2.23",
     "url-join": "^5.0.0",
     "cookies-next": "4.3.0"
@@ -60,7 +60,7 @@
     "@testing-library/react": "^14.1.2",
     "@types/jest": "^29.5.13",
     "@types/node": "22.7.2",
-    "@types/react": "^18.2.21",
+    "@types/react": "^18.3.18",
     "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@typescript-eslint/parser": "^8.7.0",
     "autoprefixer": "^10.4.20",
diff --git a/packages/core/package.json b/packages/core/package.json
index a6488b19..c291c805 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -38,9 +38,9 @@
     "dev": "npm run build:watch"
   },
   "peerDependencies": {
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-cookie": "^7.2.2",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
     "@swc/wasm": "^1.3.85",
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index f5805afc..1c26ac86 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -130,8 +130,8 @@
     "@types/mdx": "^2.0.3",
     "@types/node": "18.15.5",
     "@types/pluralize": "^0.0.33",
-    "@types/react": "^18.2.21",
-    "@types/react-dom": "^18.2.7",
+    "@types/react": "^18.3.18",
+    "@types/react-dom": "^18.3.5",
     "@types/react-table": "^7.7.15",
     "@types/recharts": "^1.8.29",
     "@types/tinycolor2": "^1.4.4",
@@ -147,8 +147,8 @@
   },
   "peerDependencies": {
     "@gen3/core": "^0.10.68",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "tailwindcss": "^3.4.16"
   },
   "files": [
diff --git a/packages/sampleCommons/package.json b/packages/sampleCommons/package.json
index 081e5439..b50f082d 100644
--- a/packages/sampleCommons/package.json
+++ b/packages/sampleCommons/package.json
@@ -34,14 +34,14 @@
     "@gen3/toolsff": "file:../tools",
     "@next/mdx": "^14.2.15",
     "@types/mdx": "^2.0.13",
-    "@types/react": "^18.2.21",
-    "@types/react-dom": "^18.2.7",
+    "@types/react": "^18.3.18",
+    "@types/react-dom": "^18.3.5",
     "@welldone-software/why-did-you-render": "^8.0.3",
     "next": "^14.2.15",
     "postcss-import": "^16.1.0",
     "postcss-preset-mantine": "^1.17.0",
-    "react": "^18.2.0",
-    "react-dom": "18.2.0"
+    "react": "^18.3.1",
+    "react-dom": "18.3.1"
   },
   "peerDependencies": {
     "tailwindcss": "^3.4.16",