diff --git a/cypress.config.mjs b/cypress.config.mjs
index 4a2238b62a..13e85e1a1e 100644
--- a/cypress.config.mjs
+++ b/cypress.config.mjs
@@ -75,6 +75,21 @@ export default defineConfig({
 						define: {
 							NEXTCLOUD_VERSION: '"32.0.0"',
 						},
+						optimizeDeps: {
+							include: [
+								'vue',
+								'@cypress/vue2',
+								'rehype-highlight',
+							],
+							force: true,
+						},
+						warmup: {
+							clientFiles: [
+								'cypress/support/component.ts',
+								'cypress/**/*.cy.ts',
+								'cypress/**/*.cy.js',
+							],
+						},
 						css: {
 							devSourcemap: true,
 							preprocessorOptions: {
diff --git a/cypress/component/NcAppSettingsDialog.cy.ts b/cypress/component/NcAppSettingsDialog.cy.ts
index a4ed31c452..06841e5e1b 100644
--- a/cypress/component/NcAppSettingsDialog.cy.ts
+++ b/cypress/component/NcAppSettingsDialog.cy.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 import { defineComponent } from 'vue'
 import NcAppSettingsDialog from '../../src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue'
 import NcAppSettingsSection from '../../src/components/NcAppSettingsSection/NcAppSettingsSection.vue'
diff --git a/cypress/component/NcDialog.cy.ts b/cypress/component/NcDialog.cy.ts
index 300590e684..cf25c7ddbd 100644
--- a/cypress/component/NcDialog.cy.ts
+++ b/cypress/component/NcDialog.cy.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 import NcDialog from '../../src/components/NcDialog/NcDialog.vue'
 
 describe('NcDialog', () => {
diff --git a/cypress/component/NcModal.cy.ts b/cypress/component/NcModal.cy.ts
index 87baa3a69f..59d657378b 100644
--- a/cypress/component/NcModal.cy.ts
+++ b/cypress/component/NcModal.cy.ts
@@ -5,7 +5,7 @@
 
 import type { Component } from 'vue'
 
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 import NcModal from '../../src/components/NcModal/NcModal.vue'
 
 describe('NcModal', () => {
diff --git a/cypress/component/NcSelect.cy.ts b/cypress/component/NcSelect.cy.ts
index 42ab86f52d..3a7515a465 100644
--- a/cypress/component/NcSelect.cy.ts
+++ b/cypress/component/NcSelect.cy.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 import NcSelect from '../../src/components/NcSelect/NcSelect.vue'
 
 describe('NcSelect', () => {
diff --git a/cypress/component/NcSelectUsers.cy.ts b/cypress/component/NcSelectUsers.cy.ts
index c52754afdc..638c2beee7 100644
--- a/cypress/component/NcSelectUsers.cy.ts
+++ b/cypress/component/NcSelectUsers.cy.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 import NcSelectUsers from '../../src/components/NcSelectUsers/NcSelectUsers.vue'
 
 it('emits the search event', async () => {
diff --git a/cypress/component/richtext.cy.ts b/cypress/component/richtext.cy.ts
index e851a7e261..66a26b3261 100644
--- a/cypress/component/richtext.cy.ts
+++ b/cypress/component/richtext.cy.ts
@@ -6,7 +6,7 @@
 // Markdown guide: https://www.markdownguide.org/basic-syntax/
 // Reference tests: https://github.com/nextcloud-deps/CDMarkdownKit/tree/master/CDMarkdownKitTests
 
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 import NcRichText from '../../src/components/NcRichText/NcRichText.vue'
 
 describe('NcRichText', () => {
diff --git a/cypress/visual/AppNavigationItem.cy.ts b/cypress/visual/AppNavigationItem.cy.ts
index fb8cc8b0ef..619eb576f7 100644
--- a/cypress/visual/AppNavigationItem.cy.ts
+++ b/cypress/visual/AppNavigationItem.cy.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 import Vue, { defineComponent } from 'vue'
 import VueRouter from 'vue-router'
 import NcAppNavigationItem from '../../src/components/NcAppNavigationItem/NcAppNavigationItem.vue'