diff --git a/.github/actions/docker-images/action.yml b/.github/actions/docker-images/action.yml
index d49f210c9b..95c7b45a33 100644
--- a/.github/actions/docker-images/action.yml
+++ b/.github/actions/docker-images/action.yml
@@ -67,12 +67,6 @@ runs:
         path: ${{ inputs.docker-build-cache-folder }}
         key: ci-buildx-${{ runner.os }}-${{ runner.arch }}-${{ github.workflow }}
 
-    - name: Cache docker images
-      uses: actions/cache@v4
-      with:
-        path: ${{ inputs.docker-images-folder }}
-        key: ci-docker-images-${{ runner.os }}-${{ runner.arch }}-${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
-
     - if: ${{ inputs.build-docker-images == 'true' }}
       name: Build cloudbeat-docker image
       uses: docker/build-push-action@v5
@@ -126,3 +120,17 @@ runs:
       run: |
         ls -lahR /tmp/ || true
         [[ -d ${{ inputs.docker-build-cache-folder }}-new ]] && rm -rf ${{ inputs.docker-build-cache-folder }} && mv ${{ inputs.docker-build-cache-folder }}-new ${{ inputs.docker-build-cache-folder }}
+
+    - if: ${{ inputs.build-docker-images == 'true' }}
+      name: Upload docker images
+      uses: actions/upload-artifact@v4
+      with:
+        name: docker-images
+        path: ${{ inputs.docker-images-folder }}
+
+    - if: ${{ inputs.build-docker-images == 'false' }}
+      name: Download docker images
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-images
+        path: ${{ inputs.docker-images-folder }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2de8c195db..3e81921502 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -310,6 +310,7 @@ jobs:
       - uses: actions/download-artifact@v4
         if: ${{ success() || failure() }}
         with:
+          pattern: allure-results-ci-*
           path: tests/allure/results/
           merge-multiple: true
 
@@ -370,3 +371,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           message: |
             ${{ env.ALLURE_SUMMARY }}
+
+      - if: ${{ always() }}
+        name: Cleanup docker image artifacts
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: docker-images
+          failOnError: false