diff --git a/config/defaults.erb b/config/defaults.erb
index 5671fe2..ee95038 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -24,14 +24,27 @@ gluon_targets = %w(
 		ramips-rt305x
 )
 
-# Add more targets if broken images are included...
+# Targets to build if possibly broken or untested images are included
 if ENV["BROKEN"]
-	gluon_targets += %w(
+	gluon_targets = %w(
+		ar71xx-generic
 		ar71xx-mikrotik
+		ar71xx-nand
+		ar71xx-tiny
+		brcm2708-bcm2708
+		brcm2708-bcm2709
 		brcm2708-bcm2710
-		ipq40xx
-		mvebu-cortexa9
+		ipq806x
+		mpc85xx-generic
+		mvebu
 		ramips-mt7620
+		ramips-mt7621
+		ramips-mt7628
+		ramips-rt305x
+		sunxi
+		x86-64
+		x86-generic
+		x86-geode
 	)
 end
 gluon_targets.sort!.uniq!