diff --git a/cypress.config.ts b/cypress.config.ts
new file mode 100644
index 0000000000..e45b8a5396
--- /dev/null
+++ b/cypress.config.ts
@@ -0,0 +1,31 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  videosFolder: 'cypress/videos',
+  screenshotsFolder: 'cypress/screenshots',
+  fixturesFolder: 'cypress/fixtures',
+  retries: {
+    runMode: 2,
+    openMode: 0,
+  },
+  env: {
+    DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
+    DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
+    DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
+    DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
+    DSPACE_TEST_ENTITY_PUBLICATION: 'e98b0f27-5c19-49a0-960d-eb6ad5287067',
+    DSPACE_TEST_SEARCH_TERM: 'test',
+    DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
+    DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
+    DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
+    DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
+  },
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.ts')(on, config)
+    },
+    baseUrl: 'http://localhost:4000',
+  },
+})
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index 3adf7839c2..0000000000
--- a/cypress.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "integrationFolder": "cypress/integration",
-  "supportFile": "cypress/support/index.ts",
-  "videosFolder": "cypress/videos",
-  "screenshotsFolder": "cypress/screenshots",
-  "pluginsFile": "cypress/plugins/index.ts",
-  "fixturesFolder": "cypress/fixtures",
-  "baseUrl": "http://127.0.0.1:4000",
-  "retries":  {
-    "runMode": 2,
-    "openMode": 0
-  },
-  "env": {
-    "DSPACE_TEST_ADMIN_USER": "dspacedemo+admin@gmail.com",
-    "DSPACE_TEST_ADMIN_PASSWORD": "dspace",
-    "DSPACE_TEST_COMMUNITY": "0958c910-2037-42a9-81c7-dca80e3892b4",
-    "DSPACE_TEST_COLLECTION": "282164f5-d325-4740-8dd1-fa4d6d3e7200",
-    "DSPACE_TEST_ENTITY_PUBLICATION": "e98b0f27-5c19-49a0-960d-eb6ad5287067",
-    "DSPACE_TEST_SEARCH_TERM": "test",
-    "DSPACE_TEST_SUBMIT_COLLECTION_NAME": "Sample Collection",
-    "DSPACE_TEST_SUBMIT_COLLECTION_UUID": "9d8334e9-25d3-4a67-9cea-3dffdef80144",
-    "DSPACE_TEST_SUBMIT_USER": "dspacedemo+submit@gmail.com",
-    "DSPACE_TEST_SUBMIT_USER_PASSWORD": "dspace"
-  }
-}
diff --git a/cypress/integration/breadcrumbs.spec.ts b/cypress/e2e/breadcrumbs.cy.ts
similarity index 88%
rename from cypress/integration/breadcrumbs.spec.ts
rename to cypress/e2e/breadcrumbs.cy.ts
index 62b9a8ad1d..157cfdce20 100644
--- a/cypress/integration/breadcrumbs.spec.ts
+++ b/cypress/e2e/breadcrumbs.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
+import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Breadcrumbs', () => {
diff --git a/cypress/integration/browse-by-author.spec.ts b/cypress/e2e/browse-by-author.cy.ts
similarity index 100%
rename from cypress/integration/browse-by-author.spec.ts
rename to cypress/e2e/browse-by-author.cy.ts
diff --git a/cypress/integration/browse-by-dateissued.spec.ts b/cypress/e2e/browse-by-dateissued.cy.ts
similarity index 100%
rename from cypress/integration/browse-by-dateissued.spec.ts
rename to cypress/e2e/browse-by-dateissued.cy.ts
diff --git a/cypress/integration/browse-by-subject.spec.ts b/cypress/e2e/browse-by-subject.cy.ts
similarity index 100%
rename from cypress/integration/browse-by-subject.spec.ts
rename to cypress/e2e/browse-by-subject.cy.ts
diff --git a/cypress/integration/browse-by-title.spec.ts b/cypress/e2e/browse-by-title.cy.ts
similarity index 100%
rename from cypress/integration/browse-by-title.spec.ts
rename to cypress/e2e/browse-by-title.cy.ts
diff --git a/cypress/integration/collection-page.spec.ts b/cypress/e2e/collection-page.cy.ts
similarity index 88%
rename from cypress/integration/collection-page.spec.ts
rename to cypress/e2e/collection-page.cy.ts
index a0140d8faf..be7ef8d182 100644
--- a/cypress/integration/collection-page.spec.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_COLLECTION } from 'cypress/support';
+import { TEST_COLLECTION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Page', () => {
diff --git a/cypress/integration/collection-statistics.spec.ts b/cypress/e2e/collection-statistics.cy.ts
similarity index 95%
rename from cypress/integration/collection-statistics.spec.ts
rename to cypress/e2e/collection-statistics.cy.ts
index 90b569c824..58601f1c4e 100644
--- a/cypress/integration/collection-statistics.spec.ts
+++ b/cypress/e2e/collection-statistics.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_COLLECTION } from 'cypress/support';
+import { TEST_COLLECTION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Statistics Page', () => {
diff --git a/cypress/integration/community-list.spec.ts b/cypress/e2e/community-list.cy.ts
similarity index 100%
rename from cypress/integration/community-list.spec.ts
rename to cypress/e2e/community-list.cy.ts
diff --git a/cypress/integration/community-page.spec.ts b/cypress/e2e/community-page.cy.ts
similarity index 88%
rename from cypress/integration/community-page.spec.ts
rename to cypress/e2e/community-page.cy.ts
index 79e21431ad..080dccf820 100644
--- a/cypress/integration/community-page.spec.ts
+++ b/cypress/e2e/community-page.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_COMMUNITY } from 'cypress/support';
+import { TEST_COMMUNITY } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Page', () => {
diff --git a/cypress/integration/community-statistics.spec.ts b/cypress/e2e/community-statistics.cy.ts
similarity index 95%
rename from cypress/integration/community-statistics.spec.ts
rename to cypress/e2e/community-statistics.cy.ts
index cbf1783c0b..4eb1d7935d 100644
--- a/cypress/integration/community-statistics.spec.ts
+++ b/cypress/e2e/community-statistics.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_COMMUNITY } from 'cypress/support';
+import { TEST_COMMUNITY } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Statistics Page', () => {
diff --git a/cypress/integration/footer.spec.ts b/cypress/e2e/footer.cy.ts
similarity index 100%
rename from cypress/integration/footer.spec.ts
rename to cypress/e2e/footer.cy.ts
diff --git a/cypress/integration/header.spec.ts b/cypress/e2e/header.cy.ts
similarity index 100%
rename from cypress/integration/header.spec.ts
rename to cypress/e2e/header.cy.ts
diff --git a/cypress/integration/homepage-statistics.spec.ts b/cypress/e2e/homepage-statistics.cy.ts
similarity index 100%
rename from cypress/integration/homepage-statistics.spec.ts
rename to cypress/e2e/homepage-statistics.cy.ts
diff --git a/cypress/integration/homepage.spec.ts b/cypress/e2e/homepage.cy.ts
similarity index 100%
rename from cypress/integration/homepage.spec.ts
rename to cypress/e2e/homepage.cy.ts
diff --git a/cypress/integration/item-page.spec.ts b/cypress/e2e/item-page.cy.ts
similarity index 94%
rename from cypress/integration/item-page.spec.ts
rename to cypress/e2e/item-page.cy.ts
index 6a454b678d..f55cfc4b4d 100644
--- a/cypress/integration/item-page.spec.ts
+++ b/cypress/e2e/item-page.cy.ts
@@ -1,5 +1,5 @@
 import { Options } from 'cypress-axe';
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
+import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item  Page', () => {
diff --git a/cypress/integration/item-statistics.spec.ts b/cypress/e2e/item-statistics.cy.ts
similarity index 95%
rename from cypress/integration/item-statistics.spec.ts
rename to cypress/e2e/item-statistics.cy.ts
index 66ebc228db..4fa90d4ef8 100644
--- a/cypress/integration/item-statistics.spec.ts
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
+import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item Statistics Page', () => {
diff --git a/cypress/integration/login-modal.spec.ts b/cypress/e2e/login-modal.cy.ts
similarity index 99%
rename from cypress/integration/login-modal.spec.ts
rename to cypress/e2e/login-modal.cy.ts
index fece28b425..431237c9fb 100644
--- a/cypress/integration/login-modal.spec.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support';
+import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 
 const page = {
     openLoginMenu() {
diff --git a/cypress/integration/my-dspace.spec.ts b/cypress/e2e/my-dspace.cy.ts
similarity index 99%
rename from cypress/integration/my-dspace.spec.ts
rename to cypress/e2e/my-dspace.cy.ts
index 48f44eecb9..d6fa707f82 100644
--- a/cypress/integration/my-dspace.spec.ts
+++ b/cypress/e2e/my-dspace.cy.ts
@@ -1,5 +1,5 @@
 import { Options } from 'cypress-axe';
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support';
+import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('My DSpace page', () => {
diff --git a/cypress/integration/pagenotfound.spec.ts b/cypress/e2e/pagenotfound.cy.ts
similarity index 100%
rename from cypress/integration/pagenotfound.spec.ts
rename to cypress/e2e/pagenotfound.cy.ts
diff --git a/cypress/integration/search-navbar.spec.ts b/cypress/e2e/search-navbar.cy.ts
similarity index 98%
rename from cypress/integration/search-navbar.spec.ts
rename to cypress/e2e/search-navbar.cy.ts
index babd9b9dfd..b13f585323 100644
--- a/cypress/integration/search-navbar.spec.ts
+++ b/cypress/e2e/search-navbar.cy.ts
@@ -1,4 +1,4 @@
-import { TEST_SEARCH_TERM } from 'cypress/support';
+import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
 
 const page = {
     fillOutQueryInNavBar(query) {
diff --git a/cypress/integration/search-page.spec.ts b/cypress/e2e/search-page.cy.ts
similarity index 97%
rename from cypress/integration/search-page.spec.ts
rename to cypress/e2e/search-page.cy.ts
index 623c370c56..8078c4a969 100644
--- a/cypress/integration/search-page.spec.ts
+++ b/cypress/e2e/search-page.cy.ts
@@ -1,5 +1,5 @@
 import { Options } from 'cypress-axe';
-import { TEST_SEARCH_TERM } from 'cypress/support';
+import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Search Page', () => {
diff --git a/cypress/integration/submission.spec.ts b/cypress/e2e/submission.cy.ts
similarity index 98%
rename from cypress/integration/submission.spec.ts
rename to cypress/e2e/submission.cy.ts
index 9eef596b02..010513dea5 100644
--- a/cypress/integration/submission.spec.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -1,6 +1,4 @@
-import { Options } from 'cypress-axe';
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support';
-import { testA11y } from 'cypress/support/utils';
+import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support/e2e';
 
 describe('New Submission page', () => {
     // NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 04c217aa0f..63d3992298 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -4,7 +4,7 @@
 // ***********************************************
 
 import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
-import { FALLBACK_TEST_REST_BASE_URL } from '.';
+import { FALLBACK_TEST_REST_BASE_URL } from './e2e';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs
 // ALL custom commands MUST be listed here for code completion to work
diff --git a/cypress/support/index.ts b/cypress/support/e2e.ts
similarity index 100%
rename from cypress/support/index.ts
rename to cypress/support/e2e.ts
diff --git a/package.json b/package.json
index 9249884c8e..47ef1dfc0b 100644
--- a/package.json
+++ b/package.json
@@ -163,8 +163,8 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "9.7.0",
-    "cypress-axe": "^0.14.0",
+    "cypress": "^12.0.1",
+    "cypress-axe": "^1.1.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.2.0",
     "eslint-plugin-deprecation": "^1.3.2",
diff --git a/yarn.lock b/yarn.lock
index 2fd4fa3bc8..306d870ff1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4255,15 +4255,15 @@ custom-event@~1.0.0:
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
   integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
 
-cypress-axe@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.14.0.tgz#5f5e70fb36b8cb3ba73a8ba01e9262ff1268d5e2"
-  integrity sha512-7Rdjnko0MjggCmndc1wECAkvQBIhuy+DRtjF7bd5YPZRFvubfMNvrxfqD8PWQmxm7MZE0ffS4Xr43V6ZmvLopg==
+cypress-axe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.1.0.tgz#3cf0052be311c34815919fc9a1ade3d981b8fd0b"
+  integrity sha512-4LsLHdjtIRHdOeiiRMk+Yf04UQjpuQ20paOi1x71z8wnL/47n73DBJ9AEdLQkptlljtsDj+DgLtysl7BeCL4Hg==
 
-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@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.0.1.tgz#3a51a38b2f162256c7226e68e902cfe1750e3d92"
+  integrity sha512-I1Ag5RsPEINfUlQtV6xwkd6ktJuu5QGiKZ3pFa/IXjcyCY6I7CH3gOz0juLOhg/LXOPrQtZH35ulcWDQohyyEA==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -4284,7 +4284,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"
@@ -5292,10 +5292,10 @@ eventemitter-asyncresource@^1.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz#734ff2e44bf448e627f7748f905d6bdd57bdb65b"
   integrity sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==
 
-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"