diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef4356f131308d94d529589b7f9e766bbc6cb338..61e3fc05be8b43a1862e5581d1f6487e24ac39f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,15 +31,20 @@ target:ar71xx-generic:
   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:ar71xx-tiny:
+target:ath79-generic:
   extends: .target
   variables:
-    GLUON_TARGET: ar71xx-tiny
+    GLUON_TARGET: ath79-generic
  
 target:brcm2708-bcm2708:
   extends: .target
@@ -51,15 +56,40 @@ target:brcm2708-bcm2709:
   variables:
     GLUON_TARGET: brcm2708-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:
   extends: .target
   variables:
     GLUON_TARGET: mpc85xx-generic
  
-target:ipq40xx:
+target:mpc85xx-p1020:
+  extends: .target
+  variables:
+    GLUON_TARGET: mpc85xx-p1020
+ 
+target:ramips-mt7620:
   extends: .target
   variables:
-    GLUON_TARGET: ipq40xx
+    GLUON_TARGET: ramips-mt7620
  
 target:ramips-mt7621:
   extends: .target
@@ -71,6 +101,16 @@ target:ramips-mt76x8:
   variables:
     GLUON_TARGET: ramips-mt76x8
  
+target:ramips-rt305x:
+  extends: .target
+  variables:
+    GLUON_TARGET: ramips-rt305x
+ 
+target:sunxi-cortexa7:
+  extends: .target
+  variables:
+    GLUON_TARGET: sunxi-cortexa7
+ 
 target:x86-generic:
   extends: .target
   variables:
diff --git a/buildall.sh b/buildall.sh
index a1afd1cc8246123527649d94c2febf5a081e7d76..00e3762e548befdbc72eb412b41970e99be533de 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -6,19 +6,26 @@ set -o pipefail
 branch=nightly
 
 TARGETS=(
-	ar71xx-generic 
-	ar71xx-nand 
-	ar71xx-tiny 
-	brcm2708-bcm2708 
-	brcm2708-bcm2709 
-	ipq40xx 
-	mpc85xx-generic
-	ramips-mt7620
-	ramips-mt76x8
-#	ramips-rt305x # build fails
-	x86-64
-	x86-generic
-	x86-geode
+    ar71xx-generic
+    ar71xx-tiny
+    ar71xx-nand
+    ath79-generic
+    brcm2708-bcm2708
+    brcm2708-bcm2709
+    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
 )
 
 sitedir=$(readlink -f $(dirname $0))