diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 7b922176b4..697ab069df 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -380,17 +380,17 @@ jobs:
           env: "NODE_ENV=development"
 
       - name: Collect CI container logs
-        if: always()
+        if: failure()
         working-directory: "."
         run: |
           docker logs appsmith 2>&1 > ~/dockerlogs.txt
           
       # Upload docker logs
       - name: Upload failed test list artifact
-        if: always()
+        if: failure()
         uses: actions/upload-artifact@v3
         with:
-          name: dockerlogs
+          name: dockerlogs-${{ matrix.job }}
           path: ~/dockerlogs.txt
 
       # Set status = failedtest