diff --git a/.github/workflows/pr-build-env.yml b/.github/workflows/pr-build-env.yml
index a38d153e..d229972c 100644
--- a/.github/workflows/pr-build-env.yml
+++ b/.github/workflows/pr-build-env.yml
@@ -74,8 +74,9 @@ jobs:
         run: /bin/sh scripts/${{ inputs.env }}/mkzip.sh
 
       - name: Upload zip as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: ${{ inputs.env }}
+          name: ${{ inputs.env }}.zip
           path: ${{ inputs.env }}.zip
+          archive: false
           retention-days: 7
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index eac3399b..dd212e81 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -78,7 +78,7 @@ jobs:
 
             const envs = ['esp32s2', 'esp32s3', 'esp32c3', 'esp32', 'esp32solo', 'esp8266'];
             const lines = envs.map(env => {
-              const artifact = artifacts.find(a => a.name === env);
+              const artifact = artifacts.find(a => a.name === `${env}.zip`);
               if (artifact) {
                 // The artifact download page URL - directly navigable in the browser
                 const artifactUrl = `${runUrl}#artifacts-${env}`;