diff --git a/.github/workflows/charts-lint.yaml b/.github/workflows/charts-lint.yaml
index 7cf2d6709b0..a8cdd5a0e7c 100644
--- a/.github/workflows/charts-lint.yaml
+++ b/.github/workflows/charts-lint.yaml
@@ -23,7 +23,8 @@ jobs:
         {
           "chart": ${{ steps.list-changed.outputs.charts2 }}
         }
-      detected: ${{ steps.list-changed.outputs.detected }}
+      detected1: ${{ steps.list-changed.outputs.detected1 }}
+      detected2: ${{ steps.list-changed.outputs.detected2 }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -46,18 +47,21 @@ jobs:
           OUTPUT_JSON2=$(echo $CHARTS_JSON | jq -r -c '.[254:500]')
           echo ::set-output name=charts1::${OUTPUT_JSON1}
           echo ::set-output name=charts2::${OUTPUT_JSON2}
-          if [[ $(echo ${OUTPUT_JSON} | jq -c '. | length') -gt 0 ]]; then
-            echo "::set-output name=detected::true"
+          if [[ $(echo ${OUTPUT_JSON1} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected1::true"
+          fi
+          if [[ $(echo ${OUTPUT_JSON2} | jq -c '. | length') -gt 0 ]]; then
+            echo "::set-output name=detected2::true"
           fi
 
   lint-charts1:
     needs:
       - generate-lint-matrix
-    if: needs.generate-lint-matrix.outputs.detected == 'true'
+    if: needs.generate-lint-matrix.outputs.detected1 == 'true'
     name: Lint charts Part 1
     strategy:
       matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix1) }}
-      fail-fast: true
+      fail-fast: false
       max-parallel: 10
     runs-on: ubuntu-latest
     steps:
@@ -87,11 +91,11 @@ jobs:
   lint-charts2:
     needs:
       - generate-lint-matrix
-    if: needs.generate-lint-matrix.outputs.detected == 'true'
+    if: needs.generate-lint-matrix.outputs.detected2 == 'true'
     name: Lint charts Part 2
     strategy:
       matrix: ${{ fromJson(needs.generate-lint-matrix.outputs.matrix2) }}
-      fail-fast: true
+      fail-fast: false
       max-parallel: 5
     runs-on: ubuntu-latest
     steps:
@@ -130,6 +134,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check lint matrix status
-        if: ${{ (needs.generate-lint-matrix.outputs.detected == 'true') && (needs.lint-charts1.result != 'success') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts2.result != 'skipped' ) ) }}
+        if: ${{ ( (needs.generate-lint-matrix.outputs.detected1 == 'true') && (needs.lint-charts1.result != 'success') ) && ( (needs.generate-lint-matrix.outputs.detected1 == 'true') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts2.result != 'skipped' ) ) ) }}
         run: exit 1