diff --git a/.github/workflows/BuildPlatform.yml b/.github/workflows/BuildPlatform.yml
index 4f8a527..75ad9b2 100644
--- a/.github/workflows/BuildPlatform.yml
+++ b/.github/workflows/BuildPlatform.yml
@@ -103,7 +103,7 @@ jobs:
         name: 'Build Platform'
 
       - name: Upload Platform Build Logs
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Platform Build Logs ${{ inputs.tool-chain }} ${{ inputs.target }} ${{ inputs.extra-build-args }}
           path: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 2faefdd..b44c272 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -150,7 +150,7 @@ jobs:
       run: stuart_setup -c .pytool/CISettings.py -t DEBUG -a ${{ matrix.ArchList }} TOOL_CHAIN_TAG=VS2022
 
     - name: Upload Setup Log As An Artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: (success() || failure()) && steps.get_ci_file_operations.outputs.setup_supported == 'true'
       with:
         name: ${{ matrix.Package }}-${{ steps.convert_arch_hyphen.outputs.arch_list }}-Setup-Log
@@ -164,7 +164,7 @@ jobs:
       run: stuart_ci_setup -c .pytool/CISettings.py -t DEBUG -a ${{ matrix.ArchList }} TOOL_CHAIN_TAG=VS2022
 
     - name: Upload CI Setup Log As An Artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: (success() || failure()) && steps.get_ci_file_operations.outputs.ci_setup_supported == 'true'
       with:
         name: ${{ matrix.Package }}-${{ steps.convert_arch_hyphen.outputs.arch_list }}-CI-Setup-Log
@@ -177,7 +177,7 @@ jobs:
       run: stuart_update -c .pytool/CISettings.py -t DEBUG -a ${{ matrix.ArchList }} TOOL_CHAIN_TAG=VS2022
 
     - name: Upload Update Log As An Artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: success() || failure()
       with:
         name: ${{ matrix.Package }}-${{ steps.convert_arch_hyphen.outputs.arch_list }}-Update-Log
@@ -293,7 +293,7 @@ jobs:
         delete_dirs(build_path)
 
     - name: Upload Build Logs As An Artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: success() || failure()
       with:
         name: ${{ matrix.Package }}-${{ steps.convert_arch_hyphen.outputs.arch_list }}-Build-Logs
@@ -338,7 +338,7 @@ jobs:
                 print(f'upload_sarif_file=false', file=fh)
 
     - name: Upload CodeQL Results (SARIF) As An Artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: steps.env_data.outputs.upload_sarif_file == 'true'
       with:
         name: ${{ matrix.Package }}-${{ steps.convert_arch_hyphen.outputs.arch_list }}-CodeQL-SARIF
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 5dbd1bf..a0fdc07 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -66,7 +66,7 @@ jobs:
           ./pf.py build-package-esp
       
       - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: build-artifacts
           path: |
@@ -113,7 +113,7 @@ jobs:
       
       - name: Upload Test Logs
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: basic-boot-logs
           path: |
@@ -185,7 +185,7 @@ jobs:
       
       - name: Upload SecureBoot Test Logs
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: secureboot-logs
           path: |
@@ -238,7 +238,7 @@ jobs:
       
       - name: Upload Strict Test Logs
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: secureboot-strict-logs
           path: out/qemu/
@@ -303,7 +303,7 @@ jobs:
       
       - name: Upload Attestation Test Logs
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: attestation-logs
           path: |
@@ -365,7 +365,7 @@ jobs:
       
       - name: Upload UUEFI Test Logs
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: uuefi-logs
           path: |
@@ -475,7 +475,7 @@ jobs:
       
       - name: Upload Cloud-Init Test Logs
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: cloud-init-logs
           path: |