diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 242ab74b3..21eebb404 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -70,9 +70,9 @@ jobs:
       run: npm run copy-build -- ${{ matrix.mode }} ${{ matrix.theme }}
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: build-artifacts
+        name: build-artifacts-${{ matrix.mode }}-${{ matrix.theme }}
         path: devextreme-ui-template-gallery/
 
   build-shell:
@@ -112,14 +112,26 @@ jobs:
       run: npm run copy-shell
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: build-artifacts
+        name: build-artifacts-shell
         path: devextreme-ui-template-gallery/
 
+  merge-artifacts:
+    runs-on: ubuntu-latest
+    needs: [build, build-shell]
+
+    steps:
+      - name: Merge screenshot artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: build-artifacts
+          pattern: build-artifacts-*
+          delete-merged: true
+
   deploy:
     name: Deploy
-    needs: [build, build-shell]
+    needs: [merge-artifacts]
     runs-on: ubuntu-latest
 
     steps:
@@ -127,7 +139,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Download build artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: build-artifacts
         path: devextreme-ui-template-gallery
@@ -138,4 +150,3 @@ jobs:
         branch: gh-pages
         folder: devextreme-ui-template-gallery
         target-folder: .
-
diff --git a/.github/workflows/test-dev-with-latest-dx.yml b/.github/workflows/test-dev-with-latest-dx.yml
index 2e7c97d3e..2da4e0d5f 100644
--- a/.github/workflows/test-dev-with-latest-dx.yml
+++ b/.github/workflows/test-dev-with-latest-dx.yml
@@ -254,8 +254,25 @@ jobs:
 
       - name: Copy screenshots artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: screenshots-${{ matrix.ARGS.project }}
+          name: screenshots-${{ matrix.ARGS.project }}-${{ matrix.ARGS.page }}-${{ matrix.theme.fullName }}
           path: ${{ github.workspace }}/packages/testing/testing/artifacts/compared-screenshots/*
           if-no-files-found: ignore
+
+  merge-artifacts:
+    runs-on: ubuntu-latest
+    needs: testcafe
+    if: ${{ failure() }}
+    strategy:
+      matrix:
+        project: [ 'angular', 'react', 'vue' ]
+
+    steps:
+      - name: Merge screenshot artifacts
+        uses: actions/upload-artifact/merge@v4
+        continue-on-error: true
+        with:
+          name: screenshots-${{ matrix.project }}
+          pattern: screenshots-${{ matrix.project }}-*
+          delete-merged: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 64eb68835..99ac50886 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -127,8 +127,25 @@ jobs:
 
     - name: Copy screenshots artifacts
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: screenshots-${{ matrix.ARGS.project }}
+        name: screenshots-${{ matrix.ARGS.project }}-${{ matrix.ARGS.page }}-${{ matrix.theme.fullName }}
         path: ${{ github.workspace }}/packages/testing/testing/artifacts/compared-screenshots/*
         if-no-files-found: ignore
+
+  merge-artifacts:
+    runs-on: ubuntu-latest
+    needs: testcafe
+    if: ${{ failure() }}
+    strategy:
+      matrix:
+        project: [ 'angular', 'react', 'vue' ]
+
+    steps:
+      - name: Merge screenshot artifacts
+        uses: actions/upload-artifact/merge@v4
+        continue-on-error: true
+        with:
+          name: screenshots-${{ matrix.project }}
+          pattern: screenshots-${{ matrix.project }}-*
+          delete-merged: true