diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml
index bceb4ce0213..55a0ad1e3e4 100644
--- a/.github/workflows/apps.release.yaml
+++ b/.github/workflows/apps.release.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Cache helm repo cache
         uses: actions/cache@v2
         with:
-          key: helmrepocache
+          key: helmrepocache-${{ github.sha }}
           path: |
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
@@ -55,7 +55,7 @@ jobs:
       - name: Cache helm repo cache
         uses: actions/cache@v2
         with:
-          key: helmrepocache
+          key: helmrepocache-${{ github.sha }}
           path: |
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
@@ -176,7 +176,7 @@ jobs:
       - name: Cache helm repo cache
         uses: actions/cache@v2
         with:
-          key: helmrepocache
+          key: helmrepocache-${{ github.sha }}
           path: |
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index 9b9da9b0af8..6e3d547a3a7 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -25,7 +25,7 @@ jobs:
       - name: Cache helm repo cache
         uses: actions/cache@v2
         with:
-          key: helmrepocache
+          key: helmrepocache-${{ github.sha }}-${{ github.sha }}
           path: |
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
@@ -91,7 +91,7 @@ jobs:
       - name: Cache helm repo cache
         uses: actions/cache@v2
         with:
-          key: helmrepocache
+          key: helmrepocache-${{ github.sha }}
           path: |
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
@@ -244,7 +244,7 @@ jobs:
       - name: Cache helm repo cache
         uses: actions/cache@v2
         with:
-          key: helmrepocache
+          key: helmrepocache-${{ github.sha }}
           path: |
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
@@ -270,7 +270,7 @@ jobs:
           for train in stable incubator develop non-free deprecated
           do
             for chart in master/charts/${train}/*; do
-              removetask "${train}" "${chart}"
+              removetask "${train}" "${chart}" &
             done
           done
           wait