diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index faac411..16edbfa 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -105,10 +105,10 @@ jobs:
         id: upload
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}-${{ matrix.version }}.iso
+          name: ${{ steps.build.outputs.iso_name }}
           path: |
-            ${{ steps.build.outputs.iso_name }}
-            ${{ steps.build.outputs.iso_name }}-CHECKSUM
+            ${{ steps.build.outputs.iso_path }}
+            ${{ steps.build.outputs.iso_path }}-CHECKSUM
           if-no-files-found: error
           retention-days: 0
           compression-level: 0
diff --git a/action.yml b/action.yml
index 64489e5..f8b2615 100644
--- a/action.yml
+++ b/action.yml
@@ -53,8 +53,11 @@ inputs:
 
 outputs:
   iso_name:
-    value: ${{ steps.rename_iso.outputs.ISO }}
-    description: The location of the .iso object
+    value: ${{ steps.rename_iso.outputs.iso_name }}
+    description: The name of the resulting .iso
+  iso_path:
+    value: ${{ steps.rename_iso.outputs.iso_path }}
+    description: The name and path of the resulting .iso
 
 runs:
   using: composite
@@ -98,4 +101,5 @@ runs:
         cd $(dirname ${full_path})
         iso_fn=$(basename ${iso_name})
         sha256sum ${iso_fn} > ${iso_fn%.iso}-CHECKSUM
-        echo "ISO=${full_path}" >> $GITHUB_OUTPUT
+        echo "iso_path=${full_path}" >> $GITHUB_OUTPUT
+        echo "iso_name=${iso_fn}" >> $GITHUB_OUTPUT