diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b81f6263f1bedebe87f69a0f146d4ed28c6b927..bce905b4e729aba895c57356aa8c983bc140cb8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,108 +79,107 @@ update:
       - ffs-openwrt-dl-cache
       - staging_dir
     key: "build-$CI_COMMIT_REF_SLUG"
- 
-target:ar71xx-generic:
-  extends: .target
-  variables:
-    GLUON_TARGET: ar71xx-generic
- 
-target:ar71xx-tiny:
-  extends: .target
-  variables:
-    GLUON_TARGET: ar71xx-tiny
- 
-target:ar71xx-nand:
-  extends: .target
-  variables:
-    GLUON_TARGET: ar71xx-nand
- 
+
 target:ath79-generic:
   extends: .target
   variables:
     GLUON_TARGET: ath79-generic
- 
-target:brcm2708-bcm2708:
+
+target:ath79-nand:
   extends: .target
   variables:
-    GLUON_TARGET: brcm2708-bcm2708
- 
-target:brcm2708-bcm2709:
+    GLUON_TARGET: ath79-nand
+
+target:ath79-mikrotik:
   extends: .target
   variables:
-    GLUON_TARGET: brcm2708-bcm2709
- 
-target:brcm2708-bcm2710:
+    GLUON_TARGET: ath79-mikrotik
+
+target:bcm27xx-bcm2708:
+  extends: .target
+  variables:
+    GLUON_TARGET: bcm27xx-bcm2708
+
+target:bcm27xx-bcm2709:
   extends: .target
   variables:
-    GLUON_TARGET: brcm2708-bcm2710
-    BROKEN: 1
- 
+    GLUON_TARGET: bcm27xx-bcm2709
+
 target:ipq40xx-generic:
   extends: .target
   variables:
     GLUON_TARGET: ipq40xx-generic
- 
+
 target:ipq806x-generic:
   extends: .target
   variables:
     GLUON_TARGET: ipq806x-generic
- 
+
 target:lantiq-xrx200:
   extends: .target
   variables:
     GLUON_TARGET: lantiq-xrx200
- 
+
 target:lantiq-xway:
   extends: .target
   variables:
     GLUON_TARGET: lantiq-xway
- 
-target:mpc85xx-generic:
+
+target:mediatek-mt7622:
+  extends: .target
+  variables:
+    GLUON_TARGET: mediatek-mt7622
+
+target:mpc85xx-p1010:
   extends: .target
   variables:
-    GLUON_TARGET: mpc85xx-generic
- 
+    GLUON_TARGET: mpc85xx-p1010
+
 target:mpc85xx-p1020:
   extends: .target
   variables:
     GLUON_TARGET: mpc85xx-p1020
- 
+
 target:ramips-mt7620:
   extends: .target
   variables:
     GLUON_TARGET: ramips-mt7620
- 
+
 target:ramips-mt7621:
   extends: .target
   variables:
     GLUON_TARGET: ramips-mt7621
- 
+
 target:ramips-mt76x8:
   extends: .target
   variables:
     GLUON_TARGET: ramips-mt76x8
- 
-target:ramips-rt305x:
+
+target:rockchip-armv8:
   extends: .target
   variables:
-    GLUON_TARGET: ramips-rt305x
- 
+    GLUON_TARGET: rockchip-armv8
+
 target:sunxi-cortexa7:
   extends: .target
   variables:
     GLUON_TARGET: sunxi-cortexa7
- 
+
 target:x86-generic:
   extends: .target
   variables:
     GLUON_TARGET: x86-generic
- 
+
 target:x86-geode:
   extends: .target
   variables:
     GLUON_TARGET: x86-geode
- 
+
+target:x86-legacy:
+  extends: .target
+  variables:
+    GLUON_TARGET: x86-legacy
+
 target:x86-64:
   extends: .target
   variables:
diff --git a/buildall.sh b/buildall.sh
index 4077a0f17fff3f1e0d14d678f58822e53609097c..7ccbfa7e6545e36a90d850538f029ec61704941f 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -6,27 +6,27 @@ set -o pipefail
 branch=nightly
 
 TARGETS=(
-    ar71xx-generic
-    ar71xx-tiny
-    ar71xx-nand
-    ath79-generic
-    brcm2708-bcm2708
-    brcm2708-bcm2709
-    brcm2708-bcm2710
-    ipq40xx-generic
-    ipq806x-generic
-    lantiq-xrx200
-    lantiq-xway
-    mpc85xx-generic
-    mpc85xx-p1020
-    ramips-mt7620
-    ramips-mt7621
-    ramips-mt76x8
-    ramips-rt305x
-    sunxi-cortexa7
-    x86-generic
-    x86-geode
-    x86-64
+	ath79-generic
+	ath79-nand
+	ath79-mikrotik
+	bcm27xx-bcm2708
+	bcm27xx-bcm2709
+	ipq40xx-generic
+	ipq806x-generic
+	lantiq-xrx200
+	lantiq-xway
+	mediatek-mt7622
+	mpc85xx-p1010
+	mpc85xx-p1020
+	ramips-mt7620
+	ramips-mt7621
+	ramips-mt76x8
+	rockchip-armv8
+	sunxi-cortexa7
+	x86-generic
+	x86-geode
+	x86-legacy
+	x86-64
 )
 
 sitedir=$(readlink -f $(dirname $0))