diff --git a/.github/workflows/e2e-cypress.yml b/.github/workflows/e2e-cypress.yml
index a771cb17ecdc..73f37896de18 100644
--- a/.github/workflows/e2e-cypress.yml
+++ b/.github/workflows/e2e-cypress.yml
@@ -1,21 +1,62 @@
 name: ⚙️ Cypress component testing
 on:
   pull_request:
-  push:
-    branches:
-      - main
+
+env:
+  CYPRESS_BASELINE_REPO: 'baseline'
+  CYPRESS_RESULTS_FOLDER: 'projects/demo-cypress/tests-results'
+  CYPRESS_BASELINE_SNAPSHOTS: 'projects/demo-cypress/tests-results/snapshots/baseline'
+  CYPRESS_SNAPSHOTS_ARTIFACTS_KEY:
+    'cypress-e2e-artifacts--${{ github.event.pull_request.head.sha || github.sha }}-${{ github.run_id }}-${{
+    github.event.number }}'
 
 jobs:
   cypress:
-    if: ${{ !contains(github.head_ref, 'release/') }}
     runs-on: ubuntu-latest
     name: Component testing result
     steps:
       - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.0
+        with:
+          ref: ${{ github.base_ref }}
+          path: ${{ env.CYPRESS_BASELINE_REPO }}
       - uses: taiga-family/ci/actions/setup/variables@v1.92.0
       - uses: taiga-family/ci/actions/setup/node@v1.92.0
-      - run: npx tsc -p projects/demo-cypress/tsconfig.json
-      - run: npx nx component-test demo-cypress
+
+      - name: Share node_modules between current and baseline repos
+        run: |
+          cp -r node_modules ${{ env.CYPRESS_BASELINE_REPO }}/node_modules
+          tree -d -L 1
+          tree -d ${{ env.CYPRESS_BASELINE_REPO }} -L 1
+
+      - name: Run tests for baseline state
+        run: |
+          cd ${{ env.CYPRESS_BASELINE_REPO }}
+          npx nx component-test demo-cypress
+          cd ../
+          mkdir -p ${{ env.CYPRESS_BASELINE_SNAPSHOTS }} && cp -r ${{ env.CYPRESS_BASELINE_REPO }}/${{env.CYPRESS_BASELINE_SNAPSHOTS }}/. ${{ env.CYPRESS_BASELINE_SNAPSHOTS }}
+          rm -r ${{ env.CYPRESS_BASELINE_REPO }}
+
+      - name: Run tests for current state
+        run: npx nx component-test demo-cypress
+
+      - name: Prepare diff screenshots
+        run: |
+          npm install canvas
+          npx ts-node ./scripts/visual-testing/combine-cypress-failed-screenshots.ts
+
+      - name: Debug output
+        continue-on-error: true
+        run: tree ${{ env.CYPRESS_RESULTS_FOLDER }}  -L 1
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4.4.0
+        with:
+          path: '${{ env.CYPRESS_RESULTS_FOLDER }}/**/*.diff.png'
+          name: ${{ env.CYPRESS_SNAPSHOTS_ARTIFACTS_KEY }}
+          if-no-files-found: ignore
+          compression-level: 0
+          retention-days: 1
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/projects/demo-cypress/cypress-image-diff.config.js b/projects/demo-cypress/cypress-image-diff.config.js
index d7f30e063186..a8a11bd2b4f9 100644
--- a/projects/demo-cypress/cypress-image-diff.config.js
+++ b/projects/demo-cypress/cypress-image-diff.config.js
@@ -6,4 +6,7 @@ module.exports = {
         FILENAME: 'report-summary',
         OVERWRITE: true,
     },
+    RETRY_OPTIONS: {
+        doNotFail: process.env.CI || false,
+    },
 };
diff --git a/projects/demo-cypress/src/tests/input-phone-international.cy.ts b/projects/demo-cypress/src/tests/input-phone-international.cy.ts
index fe35c7b6701f..d30189390dc3 100644
--- a/projects/demo-cypress/src/tests/input-phone-international.cy.ts
+++ b/projects/demo-cypress/src/tests/input-phone-international.cy.ts
@@ -29,7 +29,7 @@ import {createOutputSpy} from 'cypress/angular';
                 [formControl]="control"
                 [(countryIsoCode)]="countryIsoCode"
             >
-                <tui-icon icon="@tui.phone" />
+                <tui-icon icon="@tui.sun" />
             </tui-input-phone-international>
         </tui-root>
     `,