diff --git a/targets/x86-64 b/targets/x86-64
index 3ef12515..28de8543 100644
--- a/targets/x86-64
+++ b/targets/x86-64
@@ -1,6 +1,9 @@
 include 'x86.inc'
 
-factory_image('x86-64', 'combined-squashfs', '.img.gz')
-factory_image('x86-64', 'combined-squashfs', '.vdi')
-factory_image('x86-64', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-64', 'combined-squashfs', '.img.gz')
+packages {
+        'kmod-gpio-nct5104d',
+        'kmod-leds-gpio',
+        'kmod-leds-apu2',
+}
+
+device('x86-64', 'generic')
diff --git a/targets/x86-generic b/targets/x86-generic
index 57b55f4a..3bbe72ec 100644
--- a/targets/x86-generic
+++ b/targets/x86-generic
@@ -1,9 +1,12 @@
 include 'x86.inc'
 
-factory_image('x86-generic', 'combined-squashfs', '.img.gz')
-factory_image('x86-generic', 'combined-squashfs', '.vdi')
-factory_image('x86-generic', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-generic', 'combined-squashfs', '.img.gz', {
+packages {
+        'kmod-gpio-nct5104d',
+        'kmod-leds-gpio',
+        'kmod-leds-apu2',
+}
+
+device('x86-generic', 'generic', {
 	manifest_aliases = {
 		'x86-kvm',
 		'x86-xen_domu',
diff --git a/targets/x86-geode b/targets/x86-geode
index 57519eb1..146cfce9 100644
--- a/targets/x86-geode
+++ b/targets/x86-geode
@@ -18,5 +18,9 @@ packages {
 	'kmod-via-velocity',
 }
 
-factory_image('x86-geode', 'combined-squashfs', '.img.gz')
-sysupgrade_image('x86-geode', 'combined-squashfs', '.img.gz')
+device('x86-geode', 'generic', {
+	factory = '-squashfs-combined',
+	factory_ext = '.img.gz',
+	sysupgrade = '-squashfs-combined',
+	sysupgrade_ext = '.img.gz',
+})
diff --git a/targets/x86-legacy b/targets/x86-legacy
index 79667dad..402d7e21 100644
--- a/targets/x86-legacy
+++ b/targets/x86-legacy
@@ -1,10 +1,3 @@
 include 'x86.inc'
 
-packages {
-        '-kmod-gpio-nct5104d',
-        '-kmod-leds-gpio',
-        '-kmod-leds-apu2',
-}
-
-factory_image('x86-legacy', 'combined-squashfs', '.img.gz')
-sysupgrade_image('x86-legacy', 'combined-squashfs', '.img.gz')
+device('x86-legacy', 'generic')
diff --git a/targets/x86.inc b/targets/x86.inc
index c6037c68..286d2a07 100644
--- a/targets/x86.inc
+++ b/targets/x86.inc
@@ -22,10 +22,7 @@ packages {
 	'kmod-via-velocity',
 	'kmod-ath9k',
 	'kmod-gpio-button-hotplug',
-	'kmod-gpio-nct5104d',
 	'kmod-hwmon-core',
-	'kmod-leds-gpio',
-	'kmod-leds-apu2',
 	'kmod-sp5100_tco',
 	'kmod-usb-core',
 	'kmod-usb-ohci',
@@ -42,3 +39,10 @@ packages {
 	'kmod-mt7603',
 	'kmod-mt7615e',
 }
+
+defaults {
+	factory = '-squashfs-combined',
+	factory_ext = {'.img.gz', '.vmdk', '.vdi'},
+	sysupgrade = '-squashfs-combined',
+	sysupgrade_ext = '.img.gz',
+}