diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 80af6c68140..897777be451 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -261,6 +261,7 @@ jobs:
           mkdir -p images
           make -f Makefile.am container-live-iso-build CI_TAG=$CONTAINER_TAG
           mv result/iso/Fedora-Workstation.iso "images/${{ needs.pr-info.outputs.image_description }}-Fedora-Workstation.iso"
+          mv result/iso/logs images/
 
       - name: Make artefacts created by sudo cleanable
         if: always()
@@ -273,7 +274,7 @@ jobs:
         with:
           name: 'logs'
           path: |
-           images/*.log
+           images/logs/*
 
       - name: Upload image artifacts
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/build-image.yml.j2 b/.github/workflows/build-image.yml.j2
index 2622230ed0c..94fd3bb2d2b 100644
--- a/.github/workflows/build-image.yml.j2
+++ b/.github/workflows/build-image.yml.j2
@@ -255,6 +255,7 @@ jobs:
           mkdir -p images
           make -f Makefile.am container-live-iso-build CI_TAG=$CONTAINER_TAG
           mv result/iso/Fedora-Workstation.iso "images/${{ needs.pr-info.outputs.image_description }}-Fedora-Workstation.iso"
+          mv result/iso/logs images/
 
       - name: Make artefacts created by sudo cleanable
         if: always()
@@ -267,7 +268,7 @@ jobs:
         with:
           name: 'logs'
           path: |
-           images/*.log
+           images/logs/*
 
       - name: Upload image artifacts
         uses: actions/upload-artifact@v3