diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 4d51381a..9217cf7e 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -14,6 +14,16 @@ on:
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        sanitizer:
+          - address
+          - undefined
+        architecture:
+          - x86_64
+        include:
+          - sanitizer: address
+            architecture: i386
     steps:
     - name: Build Fuzzers
       id: build
@@ -21,17 +31,20 @@ jobs:
       with:
         oss-fuzz-project-name: 'libcoap'
         dry-run: false
-        language: c++
+        sanitizer: ${{ matrix.sanitizer }}
+        architecture: ${{ matrix.architecture }}
+        language: c
     - name: Run Fuzzers
       uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
       with:
         oss-fuzz-project-name: 'libcoap'
         fuzz-seconds: 300
+        sanitizer: ${{ matrix.sanitizer }}
         dry-run: false
-        language: c++
+        language: c
     - name: Upload Crash
       uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
-        name: artifacts
+        name: ${{ matrix.sanitizer }}-${{ matrix.architecture }}-artifacts
         path: ./out/artifacts