diff --git a/cypress.config.js b/cypress.config.js
new file mode 100644
index 000000000..292af0d4c
--- /dev/null
+++ b/cypress.config.js
@@ -0,0 +1,22 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:5001',
+    defaultCommandTimeout: 20000,
+    downloadsFolder: 'client/cypress/downloads',
+    fixturesFolder: 'client/cypress/fixtures',
+    requestTimeout: 15000,
+    screenshotsFolder: 'client/cypress/screenshots',
+    specPattern: 'client/cypress/integration/',
+    supportFile: 'client/cypress/support/index.js',
+    video: true,
+    videoUploadOnPasses: false,
+    videosFolder: 'client/cypress/videos',
+    viewportHeight: 1024,
+    viewportWidth: 1280,
+    env: {
+      coverage: false
+    }
+  },
+})
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index 4d43b9728..000000000
--- a/cypress.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "baseUrl": "http://localhost:5001",
-  "video": true,
-  "videoUploadOnPasses": false,
-  "fixturesFolder": "client/cypress/fixtures",
-  "integrationFolder": "client/cypress/integration",
-  "pluginsFile": false,
-  "screenshotsFolder": "client/cypress/screenshots",
-  "videosFolder": "client/cypress/videos",
-  "supportFile": "client/cypress/support/index.js",
-  "defaultCommandTimeout": 20000,
-  "requestTimeout": 15000,
-  "viewportWidth": 1280,
-  "viewportHeight": 1024,
-  "env": {
-    "coverage": false
-  }
-}
diff --git a/package.json b/package.json
index 3cbf34958..a01b8aee1 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "babel-plugin-transform-builtin-extend": "^1.1.2",
     "copy-webpack-plugin": "^6.4.1",
     "css-loader": "^1.0.1",
-    "cypress": "^9.7.0",
+    "cypress": "^10.11.0",
     "dayjs": "^1.11.9",
     "enzyme": "^3.8.0",
     "enzyme-adapter-react-16": "^1.7.1",
diff --git a/yarn.lock b/yarn.lock
index 0217e544d..2ef7f93d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4780,10 +4780,10 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.2.tgz#673b5f233bf34d8e602b949429f8171d9121bea3"
   integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==
 
-cypress@^9.7.0:
-  version "9.7.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744"
-  integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==
+cypress@^10.11.0:
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.11.0.tgz#e9fbdd7638bae3d8fb7619fd75a6330d11ebb4e8"
+  integrity sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -4804,7 +4804,7 @@ cypress@^9.7.0:
     dayjs "^1.10.4"
     debug "^4.3.2"
     enquirer "^2.3.6"
-    eventemitter2 "^6.4.3"
+    eventemitter2 "6.4.7"
     execa "4.1.0"
     executable "^4.1.1"
     extract-zip "2.0.1"
@@ -6110,10 +6110,10 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eventemitter2@^6.4.3:
-  version "6.4.9"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.9.tgz#41f2750781b4230ed58827bc119d293471ecb125"
-  integrity sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==
+eventemitter2@6.4.7:
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
+  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"