diff --git a/.github/workflows/build-gluon.yml b/.github/workflows/build-gluon.yml
index 1e9d13ec0a42e2752cba4910fe511b84a85a1d0a..ac98edba6542847f6f90ad93c2bd4f05ee047779 100644
--- a/.github/workflows/build-gluon.yml
+++ b/.github/workflows/build-gluon.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ar71xx-generic
           path: output
 
   ar71xx-tiny:
@@ -40,7 +40,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ar71xx-tiny
           path: output
 
   ar71xx-nand:
@@ -55,7 +55,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ar71xx-nand
           path: output
 
   ath79-generic:
@@ -70,7 +70,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ath79-generic
           path: output
 
   brcm2708-bcm2708:
@@ -85,7 +85,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: brcm2708-bcm2708
           path: output
 
   brcm2708-bcm2709:
@@ -100,7 +100,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: brcm2708-bcm2709
           path: output
 
   ipq40xx-generic:
@@ -115,7 +115,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ipq40xx-generic
           path: output
 
   ipq806x-generic:
@@ -130,7 +130,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ipq806x-generic
           path: output
 
   lantiq-xrx200:
@@ -145,7 +145,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: lantiq-xrx200
           path: output
 
   lantiq-xway:
@@ -160,7 +160,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: lantiq-xway
           path: output
 
   mpc85xx-generic:
@@ -175,7 +175,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: mpc85xx-generic
           path: output
 
   mpc85xx-p1020:
@@ -190,7 +190,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: mpc85xx-p1020
           path: output
 
   ramips-mt7620:
@@ -205,7 +205,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ramips-mt7620
           path: output
 
   ramips-mt7621:
@@ -220,7 +220,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ramips-mt7621
           path: output
 
   ramips-mt76x8:
@@ -235,7 +235,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ramips-mt76x8
           path: output
 
   ramips-rt305x:
@@ -250,7 +250,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ramips-rt305x
           path: output
 
   sunxi-cortexa7:
@@ -265,7 +265,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: sunxi-cortexa7
           path: output
 
   x86-generic:
@@ -280,7 +280,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: x86-generic
           path: output
 
   x86-geode:
@@ -295,7 +295,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: x86-geode
           path: output
 
   x86-64:
@@ -310,7 +310,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: x86-64
           path: output
 
   ar71xx-mikrotik:
@@ -325,7 +325,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: ar71xx-mikrotik
           path: output
 
   brcm2708-bcm2710:
@@ -340,7 +340,7 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: brcm2708-bcm2710
           path: output
 
   mvebu-cortexa9:
@@ -355,6 +355,6 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: mvebu-cortexa9
           path: output
 
diff --git a/contrib/actions/generate-actions.py b/contrib/actions/generate-actions.py
index a39a05c798227dafec58cb5410388f7b55c0bfc3..72786b88a46abf6264b406cfe6795dbe7bd114fc 100755
--- a/contrib/actions/generate-actions.py
+++ b/contrib/actions/generate-actions.py
@@ -31,7 +31,7 @@ ACTIONS_TARGET="""
       - name: Archive build output
         uses: actions/upload-artifact@v1
         with:
-          name: output
+          name: {target_name}
           path: output
 """