diff --git a/build-tests/x86/test-image-fedora-vmx/appliance.kiwi b/build-tests/x86/test-image-fedora/appliance.kiwi
similarity index 56%
rename from build-tests/x86/test-image-fedora-vmx/appliance.kiwi
rename to build-tests/x86/test-image-fedora/appliance.kiwi
index e61f8b51..1b321f0b 100644
--- a/build-tests/x86/test-image-fedora-vmx/appliance.kiwi
+++ b/build-tests/x86/test-image-fedora/appliance.kiwi
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!-- The line below is required in order to use the multibuild OBS features -->
+<!-- OBS-Profiles: @BUILD_FLAVOR@ -->
+
 <image schemaversion="6.9" name="VMX-Fedora-28.0">
     <description type="system">
         <author>Marcus Schaefer</author>
         <contact>ms@suse.com</contact>
-        <specification>vmx disk test build for Fedora</specification>
+        <specification>Fedora 28 JeOS</specification>
     </description>
+    <profiles>
+        <profile name="Live" description="Live image of Fedora 28"/>
+        <profile name="Virtual" description="Virtual image of Fedora 28"/>
+        <profile name="Disk" description="OEM image of Fedora 28"/>
+    </profiles>
     <preferences>
         <version>1.28.1</version>
         <packagemanager>dnf</packagemanager>
@@ -15,8 +23,23 @@
         <keytable>us</keytable>
         <timezone>UTC</timezone>
         <rpm-check-signatures>false</rpm-check-signatures>
+    </preferences>
+    <preferences profiles="Live">
+        <type image="iso" flags="overlay" firmware="uefi" hybridpersistent_filesystem="ext4" hybridpersistent="true"/>
+    </preferences>
+    <preferences profiles="Virtual">
         <type image="vmx" filesystem="ext4" bootloader="grub2" kernelcmdline="console=ttyS0 splash"/>
     </preferences>
+    <preferences profiles="Disk">
+        <type image="oem" initrd_system="dracut" filesystem="ext4" installiso="true" bootloader="grub2" firmware="uefi">
+            <oemconfig>
+                <oem-systemsize>2048</oem-systemsize>
+                <oem-swap>true</oem-swap>
+                <oem-swapsize>200</oem-swapsize>
+                <oem-multipath-scan>false</oem-multipath-scan>
+            </oemconfig>
+        </type>
+    </preferences>
     <users>
         <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
     </users>
@@ -41,6 +64,16 @@
         <package name="vim"/>
         <package name="tzdata"/>
     </packages>
+    <packages type="image" profiles="Live,Disk">
+        <package name="syslinux"/>
+    </packages>
+    <packages type="image" profiles="Live">
+        <package name="dracut-kiwi-live"/>
+    </packages>
+    <packages type="image" profiles="Disk">
+        <package name="dracut-kiwi-oem-repart"/>
+        <package name="dracut-kiwi-oem-dump"/>
+    </packages>
     <packages type="bootstrap">
         <package name="filesystem"/>
         <package name="basesystem"/>
diff --git a/build-tests/x86/test-image-fedora-vmx/config.sh b/build-tests/x86/test-image-fedora/config.sh
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/config.sh
rename to build-tests/x86/test-image-fedora/config.sh
diff --git a/build-tests/x86/test-image-fedora-vmx/root/etc/login.defs b/build-tests/x86/test-image-fedora/root/etc/login.defs
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/etc/login.defs
rename to build-tests/x86/test-image-fedora/root/etc/login.defs
diff --git a/build-tests/x86/test-image-fedora-vmx/root/etc/selinux/config b/build-tests/x86/test-image-fedora/root/etc/selinux/config
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/etc/selinux/config
rename to build-tests/x86/test-image-fedora/root/etc/selinux/config
diff --git a/build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/authconfig b/build-tests/x86/test-image-fedora/root/etc/sysconfig/authconfig
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/authconfig
rename to build-tests/x86/test-image-fedora/root/etc/sysconfig/authconfig
diff --git a/build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/firstboot b/build-tests/x86/test-image-fedora/root/etc/sysconfig/firstboot
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/firstboot
rename to build-tests/x86/test-image-fedora/root/etc/sysconfig/firstboot
diff --git a/build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/network b/build-tests/x86/test-image-fedora/root/etc/sysconfig/network
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/network
rename to build-tests/x86/test-image-fedora/root/etc/sysconfig/network
diff --git a/build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/network-scripts/ifcfg-lan0 b/build-tests/x86/test-image-fedora/root/etc/sysconfig/network-scripts/ifcfg-lan0
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/etc/sysconfig/network-scripts/ifcfg-lan0
rename to build-tests/x86/test-image-fedora/root/etc/sysconfig/network-scripts/ifcfg-lan0
diff --git a/build-tests/x86/test-image-fedora-vmx/root/etc/udev/rules.d/70-persistent-net.rules b/build-tests/x86/test-image-fedora/root/etc/udev/rules.d/70-persistent-net.rules
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/etc/udev/rules.d/70-persistent-net.rules
rename to build-tests/x86/test-image-fedora/root/etc/udev/rules.d/70-persistent-net.rules
diff --git a/build-tests/x86/test-image-fedora-vmx/root/fastboot b/build-tests/x86/test-image-fedora/root/fastboot
similarity index 100%
rename from build-tests/x86/test-image-fedora-vmx/root/fastboot
rename to build-tests/x86/test-image-fedora/root/fastboot