diff --git a/Fedora.kiwi b/Fedora.kiwi
index 37c250f..cff2397 100644
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@@ -34,6 +34,7 @@
 	<include from="this://./components/desktops/cosmic.xml"/>
 	<include from="this://./components/liveinstall.xml"/>
 	<include from="this://./components/users.xml"/>
+	<include from="this://./teams/base.xml"/>
 	<include from="this://./teams/cloud/cloud.xml"/>
 	<include from="this://./teams/cloud/container.xml"/>
 	<include from="this://./teams/cloud/vagrant.xml"/>
diff --git a/teams/base.xml b/teams/base.xml
new file mode 100644
index 0000000..cf7da0d
--- /dev/null
+++ b/teams/base.xml
@@ -0,0 +1,17 @@
+<image>
+	<profiles>
+		<profile name="Minimal-Disk" description="Minimal Install Disk">
+			<requires profile="BootDiskCore"/>
+		</profile>
+	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Minimal-Disk">
+		<package name="fedora-release"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="Minimal-Disk">
+		<namedCollection name="core"/>
+		<namedCollection name="standard"/>
+		<namedCollection name="networkmanager-submodules"/>
+		<package name="initial-setup"/>
+		<ignore name="initial-setup-gui"/>
+	</packages>
+</image>
diff --git a/tmt/plans/base/minimal-disk.fmf b/tmt/plans/base/minimal-disk.fmf
new file mode 100644
index 0000000..4de8bdb
--- /dev/null
+++ b/tmt/plans/base/minimal-disk.fmf
@@ -0,0 +1,9 @@
+summary: Build Minimal disk image
+discover:
+    how: fmf
+environment:
+    image_type: oem
+    image_profile: Minimal-Disk
+    kiwi_file: Fedora.kiwi
+execute:
+    how: tmt