diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2d542adf25..7a087044a6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -193,7 +193,7 @@ jobs:
 
             > The coverage result does not include the functional test coverage. 
       - name: Save coverage (only main push)
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: matrix.target_arch == 'amd64' && matrix.target_os == 'linux' && github.ref == 'refs/heads/main'
         with:
           path: ./dist/cache
diff --git a/.github/workflows/functional-test.yaml b/.github/workflows/functional-test.yaml
index 5109ecd604..b581890056 100644
--- a/.github/workflows/functional-test.yaml
+++ b/.github/workflows/functional-test.yaml
@@ -374,7 +374,7 @@ jobs:
         run: |
           echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
           echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ${{ steps.go-cache-paths.outputs.go-build }}
@@ -609,7 +609,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: recipes-pod-logs
+          name: ${{ matrix.name }}_recipes-pod-logs
           path: recipes/pod-logs
           if-no-files-found: error
       - uses: marocchino/sticky-pull-request-comment@v2
diff --git a/.github/workflows/long-running-azure.yaml b/.github/workflows/long-running-azure.yaml
index d2508de1f5..24088da4d8 100644
--- a/.github/workflows/long-running-azure.yaml
+++ b/.github/workflows/long-running-azure.yaml
@@ -107,7 +107,7 @@ jobs:
       RAD_CLI_ARTIFACT_NAME: ${{ steps.gen-id.outputs.RAD_CLI_ARTIFACT_NAME }}
     steps:
       - name: Restore the latest cached binaries
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: ./dist/cache
           key: radius-test-latest-
@@ -261,7 +261,7 @@ jobs:
           echo "PR_NUMBER=${{ steps.gen-id.outputs.PR_NUMBER }}" >> ./dist/cache/.buildenv
           echo "BICEP_RECIPE_TAG_VERSION=${{ steps.gen-id.outputs.REL_VERSION }}" >> ./dist/cache/.buildenv
       - name: Store the latest binaries into cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: steps.skip-build.outputs.SKIP_BUILD != 'true' && success()
         with:
           path: ./dist/cache
@@ -328,7 +328,7 @@ jobs:
           path: bin
       - name: Restore the latest cached binaries
         if: env.SKIP_BUILD == 'true'
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: ./dist/cache
           key: radius-test-latest-
diff --git a/.github/workflows/retry-functional-test.yaml b/.github/workflows/retry-functional-test.yaml
index 03087a0344..551bb3fd10 100644
--- a/.github/workflows/retry-functional-test.yaml
+++ b/.github/workflows/retry-functional-test.yaml
@@ -546,7 +546,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: recipes-pod-logs
+          name: ${{ matrix.name }}_recipes-pod-logs
           path: recipes/pod-logs
           if-no-files-found: error
       - uses: marocchino/sticky-pull-request-comment@v2