diff --git a/Fedora.kiwi b/Fedora.kiwi
index 9ae4da7..010402f 100644
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@@ -29,6 +29,7 @@
 	<include from="this://./components/desktops/phosh.xml"/>
 	<include from="this://./components/desktops/sway.xml"/>
 	<include from="this://./components/desktops/budgie.xml"/>
+	<include from="this://./components/desktops/miraclewm.xml"/>
 	<include from="this://./components/liveinstall.xml"/>
 	<include from="this://./components/users.xml"/>
 	<include from="this://./teams/cloud/cloud.xml"/>
@@ -45,6 +46,7 @@
 	<include from="this://./teams/soas.xml"/>
 	<include from="this://./teams/sway.xml"/>
 	<include from="this://./teams/budgie.xml"/>
+	<include from="this://./teams/miraclewm.xml"/>
 	<packages type="bootstrap">
 		<package name="basesystem"/>
 		<package name="filesystem"/>
diff --git a/components/desktops/miraclewm.xml b/components/desktops/miraclewm.xml
new file mode 100644
index 0000000..74b51f2
--- /dev/null
+++ b/components/desktops/miraclewm.xml
@@ -0,0 +1,15 @@
+<image>
+	<profiles>
+		<profile name="DesktopCommon" description="Common desktop packages"/>
+		<profile name="MiracleWM-Desktop" description="MiracleWM Desktop">
+			<requires profile="DesktopCommon"/>
+		</profile>
+	</profiles>
+	<packages type="image" patternType="plusRecommended" profiles="MiracleWM-Desktop">
+		<!-- install env-group to resolve RhBug:1891500 -->
+		<namedCollection name="miraclewm-desktop-environment"/>
+		<namedCollection name="firefox"/>
+		<package name="initial-setup-gui"/>
+		<package name="initial-setup-gui-wayland-miraclewm"/>
+	</packages>
+</image>
diff --git a/teams/miraclewm.xml b/teams/miraclewm.xml
new file mode 100644
index 0000000..beb18f8
--- /dev/null
+++ b/teams/miraclewm.xml
@@ -0,0 +1,15 @@
+<image>
+	<profiles>
+		<profile name="MiracleWM-Live" description="MiracleWM Spin Live DVD">
+			<requires profile="MiracleWM-Desktop"/>
+			<requires profile="LiveInstall"/>
+		</profile>
+		<profile name="MiracleWM-Disk" description="MiracleWM Spin Install Disk">
+			<requires profile="BootDiskCore"/>
+			<requires profile="MiracleWM-Desktop"/>
+		</profile>
+	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="MiracleWM-Live,MiracleWM-Disk">
+		<package name="fedora-release-miraclewm"/>
+	</packages>
+</image>