diff --git a/.github/workflows/build-epyc7002.yml b/.github/workflows/build-epyc7002.yml
index 9dcab759..ece70046 100644
--- a/.github/workflows/build-epyc7002.yml
+++ b/.github/workflows/build-epyc7002.yml
@@ -5,6 +5,9 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        version: [7.1, 7.2]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -12,26 +15,28 @@ jobs:
 
       - name: Download toolchain
         run: |
-          wget https://global.synologydownload.com/download/ToolChain/toolchain/7.2-63134/AMD%20x86%20Linux%20Linux%205.10.55%20%28epyc7002%29/epyc7002-gcc1220_glibc236_x86_64-GPL.txz
+          env_tarball=ds.epyc7002-${{ matrix.version }}.env.txz
+          wget https://global.synologydownload.com/download/ToolChain/toolkit/${{ matrix.version }}/epyc7002/$env_tarball
           mkdir toolchain
-          tar xf epyc7002-gcc1220_glibc236_x86_64-GPL.txz -C toolchain
+          tar xf $env_tarball -C toolchain
 
       - name: Download kernel source
         run: |
-          wget https://global.synologydownload.com/download/ToolChain/toolkit/7.2/epyc7002/ds.epyc7002-7.2.dev.txz
+          dev_tarball=ds.epyc7002-${{ matrix.version }}.dev.txz
+          wget https://global.synologydownload.com/download/ToolChain/toolkit/${{ matrix.version }}/epyc7002/$dev_tarball
           mkdir ksrc
-          tar xf ds.epyc7002-7.2.dev.txz -C ksrc
+          tar xf $dev_tarball -C ksrc
 
       - name: Build
         run: |
           export BACKPORT_DIR=$PWD
-          export KLIB_BUILD=$PWD/ksrc/usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-7.2/build
-          export CROSS_COMPILE=$PWD/toolchain/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu-
+          export KLIB_BUILD=$PWD/ksrc/usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${{ matrix.version }}/build
+          export CROSS_COMPILE=$PWD/toolchain/usr/local/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu-
           make defconfig-drm
           make -j$(nproc) modules_copy
 
       - name: Save Build Result
         uses: actions/upload-artifact@v3
         with:
-          name: i915_dsm_epyc7002
+          name: i915_dsm-${{ matrix.version }}_epyc7002
           path: out/modules/