diff --git a/targets/x86-generic/config b/targets/x86-generic/config
index 222a2258..e70b7455 100644
--- a/targets/x86-generic/config
+++ b/targets/x86-generic/config
@@ -1,4 +1,3 @@
 CONFIG_TARGET_x86=y
-CONFIG_X86_USE_GRUB2=y
-CONFIG_X86_VDI_IMAGES=y
-CONFIG_X86_VMDK_IMAGES=y
+CONFIG_VDI_IMAGES=y
+CONFIG_VMDK_IMAGES=y
diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
index d3a42929..8370368a 100644
--- a/targets/x86-generic/profiles.mk
+++ b/targets/x86-generic/profiles.mk
@@ -1 +1,11 @@
-$(eval $(call GluonProfile,Generic))
+$(eval $(call GluonProfile,VDI,kmod-pcnet32))
+$(eval $(call GluonProfileFactorySuffix,VDI))
+$(eval $(call GluonProfileSysupgradeSuffix,VDI))
+$(eval $(call GluonProfileExtraSuffix,VDI,.vdi))
+$(eval $(call GluonModel,VDI,combined-squashfs,x86-virtualbox))
+
+$(eval $(call GluonProfile,VMDK,kmod-pcnet32))
+$(eval $(call GluonProfileFactorySuffix,VMDK))
+$(eval $(call GluonProfileSysupgradeSuffix,VMDK))
+$(eval $(call GluonProfileExtraSuffix,VMDK,.vmdk))
+$(eval $(call GluonModel,VMDK,combined-squashfs,x86-vmware))