diff --git a/mainboards/.github/workflows/ci.yml b/mainboards/.github/workflows/ci.yml
index 4af1500..534e437 100644
--- a/mainboards/.github/workflows/ci.yml
+++ b/mainboards/.github/workflows/ci.yml
@@ -34,30 +34,31 @@ jobs:
       matrix:
         # The `${{ matrix.mainboard }}` variable is replaced with each of these.
         mainboard:
-          - aeeon/up
-          - aeeon/upxtreme
-          - amd/rome
-          - ampere/jade
-          - bytedance/g220a
-          - cubie/board
-          - digitalloggers/atomicpi
-          - hpe/dl360gen10
-          - intel/generic
-          - intel/hw
-          - intel/minplatform
-          - intel/s2600
-          - lenovo/hr630
-          - lenovo/sr630
-          - lenovo/thinkpad
-          - marvel/macchiatobin
-          - opentitanpilot/dresden
-          - pcengines/apu
-          - pcengines/apu2
-          - seeed/beaglev
+          # '-' is used instead of '/' due to restrictions on artifact upload.
+          - aeeon-up
+          - aeeon-upxtreme
+          - amd-rome
+          - ampere-jade
+          - bytedance-g220a
+          - cubie-board
+          - digitalloggers-atomicpi
+          - hpe-dl360gen10
+          - intel-generic
+          - intel-hw
+          - intel-minplatform
+          - intel-s2600
+          - lenovo-hr630
+          - lenovo-sr630
+          - lenovo-thinkpad
+          - marvel-macchiatobin
+          - opentitanpilot-dresden
+          - pcengines-apu
+          - pcengines-apu2
+          - seeed-beaglev
           - slimboot
-          - st/st32mp1517c
+          - st-st32mp1517c
           - tyan7106
-          - walmart/robot
+          - walmart-robot
 
       # Do not cancel all jobs steps if a single one fails.
       fail-fast: false
@@ -78,15 +79,14 @@ jobs:
       - name: Make ${{ matrix.mainboard }} kernel
         run: |
           PATH=$PATH:$GOPATH/bin
-          cd ${{ matrix.mainboard }}
+          cd $(echo ${{ matrix.mainboard }} | tr '-' '/')
           make fetch
           make flashkernel
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
-          name: Kernel and Initramfs
+          name: ${{ matrix.mainboard }}
           path: |
             **/flashkernel
             **/flashinitramfs.cpio
           retention-days: 30
-