diff --git a/.github/workflows/fuzzing-run.yml b/.github/workflows/fuzzing-run.yml
index 185a3664f..e497e236e 100644
--- a/.github/workflows/fuzzing-run.yml
+++ b/.github/workflows/fuzzing-run.yml
@@ -39,26 +39,24 @@ jobs:
         with:
           name: ${{ inputs.target }}-fuzzer
 
+      - name: Install prerequisites
+        run: |
+          sudo apt update
+          sudo apt install -y clang
+
       - name: Run osconfig-fuzzer
         working-directory: ${{ steps.download.outputs.download-path }}/fuzzer
         run: |
-          # TODO: To be dropped, temporary workaround for missing compiler in the container
-          # which can only be satisfied after merging dockerfile changes:
-          # https://github.com/Azure/azure-osconfig/pull/791
-          sudo apt install -y clang
           sudo chmod +x ./osconfig-fuzzer
           mkdir /tmp/corpus
+          mkdir /tmp/artifacts
           cp -r ${{ steps.download.outputs.download-path }}/src/fuzzer/seed_corpus/* /tmp/corpus
-          ./osconfig-fuzzer -max_total_time=${{ inputs.timeout-seconds }} /tmp/corpus 2>/tmp/osconfig-fuzzer.log >/dev/null
-
-      - uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: ${{ inputs.target }}-crashes
-          path: '${{ steps.download.outputs.download-path }}/fuzzer/crash-*'
+          ./osconfig-fuzzer -artifact_prefix=/tmp/artifacts/ -max_total_time=${{ inputs.timeout-seconds }} /tmp/corpus 2>&1 >/dev/null | tee /tmp/osconfig-fuzzer.log
 
       - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
           name: ${{ inputs.target }}-logs
-          path: '/tmp/osconfig-fuzzer.log'
+          path: |
+            '/tmp/osconfig-fuzzer.log'
+            '/tmp/artifacts'