diff --git a/targets/x86-64 b/targets/x86-64
index 1ab9938d..288e3d50 100644
--- a/targets/x86-64
+++ b/targets/x86-64
@@ -1,9 +1,14 @@
 include 'x86.inc'
 
 packages {
-        'kmod-gpio-nct5104d',
-        'kmod-leds-gpio',
-        'kmod-pcengines-apuv2',
+	'kmod-gpio-nct5104d',
+	'kmod-leds-gpio',
+	'kmod-pcengines-apuv2',
 }
 
-device('x86-64', 'generic')
+device('x86-64', 'generic', {
+	extra_images = {
+		{'-kernel', '-kernel', '.bin'},
+		{'-squashfs-rootfs', '-rootfs', '.img.gz'},
+	},
+})
diff --git a/targets/x86-generic b/targets/x86-generic
index 0e6d2b39..bee0bd95 100644
--- a/targets/x86-generic
+++ b/targets/x86-generic
@@ -1,12 +1,16 @@
 include 'x86.inc'
 
 packages {
-        'kmod-gpio-nct5104d',
-        'kmod-leds-gpio',
-        'kmod-pcengines-apuv2',
+	'kmod-gpio-nct5104d',
+	'kmod-leds-gpio',
+	'kmod-pcengines-apuv2',
 }
 
 device('x86-generic', 'generic', {
+	extra_images = {
+		{'-kernel', '-kernel', '.bin'},
+		{'-squashfs-rootfs', '-rootfs', '.img.gz'},
+	},
 	manifest_aliases = {
 		'x86-kvm',
 		'x86-xen_domu',