diff --git a/.github/workflows/dhis2-verify-lib.yml b/.github/workflows/dhis2-verify-lib.yml
index 85235516..2407f474 100644
--- a/.github/workflows/dhis2-verify-lib.yml
+++ b/.github/workflows/dhis2-verify-lib.yml
@@ -29,7 +29,7 @@ jobs:
             - name: Build
               run: yarn build
 
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   name: lib-build
                   path: |
@@ -61,7 +61,7 @@ jobs:
               with:
                   node-version: 18.x
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: lib-build
 
@@ -83,7 +83,7 @@ jobs:
               with:
                   node-version: 18.x
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: lib-build
 
diff --git a/adapter/package.json b/adapter/package.json
index db0fa89f..b52f53e0 100644
--- a/adapter/package.json
+++ b/adapter/package.json
@@ -30,8 +30,8 @@
         "@testing-library/react-hooks": "^8.0.1",
         "enzyme": "^3.11.0",
         "enzyme-adapter-react-16": "^1.15.5",
-        "react": "^16.8",
-        "react-dom": "^16.8"
+        "react": "^18",
+        "react-dom": "^18"
     },
     "scripts": {
         "build": "d2-app-scripts build",
@@ -44,7 +44,7 @@
         "classnames": "^2",
         "moment": "^2",
         "prop-types": "^15",
-        "react": "^16.8",
+        "react": "^16.8 || ^18",
         "react-dom": "^16.8",
         "styled-jsx": "^4"
     },
diff --git a/cli/src/commands/start.js b/cli/src/commands/start.js
index 8853489f..0002e854 100644
--- a/cli/src/commands/start.js
+++ b/cli/src/commands/start.js
@@ -24,6 +24,8 @@ const handler = async ({
     proxyPort,
     host,
 }) => {
+    // ToDo: remove before merging
+    reporter.print('!! CLI with React@18 !!')
     const paths = makePaths(cwd)
 
     const mode = 'development'
diff --git a/shell/package.json b/shell/package.json
index 255881fa..d013b5a7 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -24,8 +24,8 @@
         "moment": "^2.29.1",
         "post-robot": "^10.0.46",
         "prop-types": "^15.7.2",
-        "react": "^16.8.6",
-        "react-dom": "^16.8.6",
+        "react": "^18",
+        "react-dom": "^18",
         "source-map-explorer": "^2.1.0",
         "styled-jsx": "^4.0.1",
         "typeface-roboto": "^0.0.75",