diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
index 2d1a0e592..dede74c6d 100644
--- a/.github/workflows/deploy-staging.yml
+++ b/.github/workflows/deploy-staging.yml
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 22.x
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -144,7 +144,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 22.x
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml
index 8f4a6850e..4ec315305 100644
--- a/.github/workflows/run-e2e-tests.yml
+++ b/.github/workflows/run-e2e-tests.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: "23.x"
+          node-version: "22.x"
 
       - name: Install dependencies
         run: |
@@ -86,7 +86,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
-          node-version: "23.x"
+          node-version: "22.x"
 
       - name: Install dependencies
         run: yarn install
diff --git a/tests/e2e/playwright.config.ts b/tests/e2e/playwright.config.ts
index faddf369a..4a5c41c6f 100644
--- a/tests/e2e/playwright.config.ts
+++ b/tests/e2e/playwright.config.ts
@@ -68,6 +68,8 @@ export default defineConfig({
         viewport: { width: 1920, height: 1080 }
       }
     },
+    // WebKit on CI is flaky, so we run it only locally
+    /*
     {
       name: 'webkit',
       use: {
@@ -75,6 +77,7 @@ export default defineConfig({
         viewport: { width: 1920, height: 1080 }
       }
     }
+    */
   ],
   outputDir: 'test-results',
   timeout: 60_000,
diff --git a/tests/e2e/tests/edit/edit_corner_cases.spec.ts b/tests/e2e/tests/edit/edit_corner_cases.spec.ts
index b85e295c0..f1c6c191d 100644
--- a/tests/e2e/tests/edit/edit_corner_cases.spec.ts
+++ b/tests/e2e/tests/edit/edit_corner_cases.spec.ts
@@ -32,6 +32,8 @@ for (const editorName of editors) {
     })
 
     test(`MTHTML-97 Validate formula edition on styled text blocks: ${editorName} editor`, async ({ page }) => {
+      test.skip(editorName === 'generic' && test.info().project.name === 'firefox', 'Not possible to apply styles with shortcuts in generic editor on Firefox')
+
       const { editor, wirisEditor } = await setupEditor(page, editorName)
 
       await editor.open()
@@ -83,7 +85,9 @@ for (const editorName of editors) {
       expect(isTextAfterEquation).toBeTruthy()
     })
 
-    test(`MTHTML-100 User edits a formula deleted during edition: ${editorName} editor`, async ({ page }) => {
+    test(`MTHTML-100 User edits a formula deleted during edition: ${editorName} editor`, {tag: editorName === 'ckeditor5' ? ['@knownIssue'] : []}, async ({ page }) => {
+      test.fail(editorName === 'ckeditor5', 'Known issue in CKEditor5')
+
       const { editor, wirisEditor } = await setupEditor(page, editorName)
 
       await editor.open()
diff --git a/tests/e2e/tests/insert/insert_corner_cases.spec.ts b/tests/e2e/tests/insert/insert_corner_cases.spec.ts
index 9fc00d19c..2bc0c4553 100644
--- a/tests/e2e/tests/insert/insert_corner_cases.spec.ts
+++ b/tests/e2e/tests/insert/insert_corner_cases.spec.ts
@@ -73,7 +73,7 @@ for (const editorName of editors) {
         await wirisEditor.waitUntilLoaded()
         await wirisEditor.insertEquationUsingEntryForm(Equations.singleNumber.mathml)
         await editor.waitForEquation(Equations.singleNumber)
-        await editor.type('12')
+        await editor.type('11')
 
         const equationsInHTMLEditor = await editor.getEquations()
         const isEquationPresent = equationsInHTMLEditor.some((equation: Equation) => equation.altText === Equations.singleNumber.altText)