diff --git a/config/defaults.erb b/config/defaults.erb
index 686dc26..5cff607 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -8,15 +8,21 @@ gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experi
 
 gluon_targets = %w(
 	ar71xx-generic
-	ar71xx-tiny
 	ar71xx-nand
+	ar71xx-tiny
 	brcm2708-bcm2708
 	brcm2708-bcm2709
+	ipq40xx
+	ipq806x
 	mpc85xx-generic
+	ramips-mt7620
 	ramips-mt7621
+	ramips-mt76x8
+	ramips-rt305x
+	sunxi-cortexa7
+	x86-64
 	x86-generic
 	x86-geode
-	x86-64
 )
 
 # Add more targets if broken images are included...
@@ -24,12 +30,7 @@ if ENV["BROKEN"]
 	gluon_targets += %w(
 		ar71xx-mikrotik
 		brcm2708-bcm2710
-		ipq806x
-		mvebu
-		ramips-mt7620
-		ramips-mt7628
-		ramips-rt305x
-		sunxi
+		mvebu-cortexa9
 	)
 end
 gluon_targets.sort!.uniq!