diff --git a/cypress.config.ts b/cypress.config.ts
new file mode 100644
index 000000000..4b233b3b6
--- /dev/null
+++ b/cypress.config.ts
@@ -0,0 +1,22 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  env: {
+    API_URL: 'http://localhost:3456/api/v1',
+    TEST_SECRET: 'averyLongSecretToSe33dtheDB',
+  },
+  video: false,
+  retries: {
+    runMode: 2,
+  },
+  projectId: '181c7x',
+  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.js')(on, config)
+    },
+    baseUrl: 'http://localhost:4173',
+    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+  },
+})
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index 48eb6ac59..000000000
--- a/cypress.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "baseUrl": "http://localhost:4173",
-  "env": {
-    "API_URL": "http://localhost:3456/api/v1",
-    "TEST_SECRET": "averyLongSecretToSe33dtheDB"
-  },
-  "video": false,
-  "retries": {
-    "runMode": 2
-  },
-  "projectId": "181c7x"
-}
diff --git a/cypress/integration/list/list-history.spec.js b/cypress/e2e/list/list-history.spec.js
similarity index 100%
rename from cypress/integration/list/list-history.spec.js
rename to cypress/e2e/list/list-history.spec.js
diff --git a/cypress/integration/list/list-view-gantt.spec.js b/cypress/e2e/list/list-view-gantt.spec.js
similarity index 100%
rename from cypress/integration/list/list-view-gantt.spec.js
rename to cypress/e2e/list/list-view-gantt.spec.js
diff --git a/cypress/integration/list/list-view-kanban.spec.js b/cypress/e2e/list/list-view-kanban.spec.js
similarity index 100%
rename from cypress/integration/list/list-view-kanban.spec.js
rename to cypress/e2e/list/list-view-kanban.spec.js
diff --git a/cypress/integration/list/list-view-list.spec.js b/cypress/e2e/list/list-view-list.spec.js
similarity index 100%
rename from cypress/integration/list/list-view-list.spec.js
rename to cypress/e2e/list/list-view-list.spec.js
diff --git a/cypress/integration/list/list-view-table.spec.js b/cypress/e2e/list/list-view-table.spec.js
similarity index 100%
rename from cypress/integration/list/list-view-table.spec.js
rename to cypress/e2e/list/list-view-table.spec.js
diff --git a/cypress/integration/list/list.spec.js b/cypress/e2e/list/list.spec.js
similarity index 100%
rename from cypress/integration/list/list.spec.js
rename to cypress/e2e/list/list.spec.js
diff --git a/cypress/integration/list/namespaces.spec.js b/cypress/e2e/list/namespaces.spec.js
similarity index 100%
rename from cypress/integration/list/namespaces.spec.js
rename to cypress/e2e/list/namespaces.spec.js
diff --git a/cypress/integration/list/prepareLists.js b/cypress/e2e/list/prepareLists.js
similarity index 100%
rename from cypress/integration/list/prepareLists.js
rename to cypress/e2e/list/prepareLists.js
diff --git a/cypress/integration/misc/editor.spec.js b/cypress/e2e/misc/editor.spec.js
similarity index 100%
rename from cypress/integration/misc/editor.spec.js
rename to cypress/e2e/misc/editor.spec.js
diff --git a/cypress/integration/misc/menu.spec.js b/cypress/e2e/misc/menu.spec.js
similarity index 100%
rename from cypress/integration/misc/menu.spec.js
rename to cypress/e2e/misc/menu.spec.js
diff --git a/cypress/integration/sharing/linkShare.spec.js b/cypress/e2e/sharing/linkShare.spec.js
similarity index 100%
rename from cypress/integration/sharing/linkShare.spec.js
rename to cypress/e2e/sharing/linkShare.spec.js
diff --git a/cypress/integration/sharing/team.spec.js b/cypress/e2e/sharing/team.spec.js
similarity index 100%
rename from cypress/integration/sharing/team.spec.js
rename to cypress/e2e/sharing/team.spec.js
diff --git a/cypress/integration/task/overview.spec.js b/cypress/e2e/task/overview.spec.js
similarity index 100%
rename from cypress/integration/task/overview.spec.js
rename to cypress/e2e/task/overview.spec.js
diff --git a/cypress/integration/task/task.spec.js b/cypress/e2e/task/task.spec.js
similarity index 100%
rename from cypress/integration/task/task.spec.js
rename to cypress/e2e/task/task.spec.js
diff --git a/cypress/integration/user/login.spec.js b/cypress/e2e/user/login.spec.js
similarity index 100%
rename from cypress/integration/user/login.spec.js
rename to cypress/e2e/user/login.spec.js
diff --git a/cypress/integration/user/logout.spec.js b/cypress/e2e/user/logout.spec.js
similarity index 100%
rename from cypress/integration/user/logout.spec.js
rename to cypress/e2e/user/logout.spec.js
diff --git a/cypress/integration/user/registration.spec.js b/cypress/e2e/user/registration.spec.js
similarity index 100%
rename from cypress/integration/user/registration.spec.js
rename to cypress/e2e/user/registration.spec.js
diff --git a/cypress/integration/user/settings.spec.js b/cypress/e2e/user/settings.spec.js
similarity index 100%
rename from cypress/integration/user/settings.spec.js
rename to cypress/e2e/user/settings.spec.js
diff --git a/cypress/support/index.js b/cypress/support/e2e.js
similarity index 100%
rename from cypress/support/index.js
rename to cypress/support/e2e.js