diff --git a/Fedora.kiwi b/Fedora.kiwi
index a477059..c5ed527 100644
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@@ -56,6 +56,7 @@
 	<include from="this://./teams/asahi.xml"/>
 	<include from="this://./teams/python.xml"/>
 	<include from="this://./teams/scitech.xml"/>
+	<include from="this://./teams/phosh.xml"/>
 	<packages type="bootstrap">
 		<package name="filesystem"/>
 	</packages>
diff --git a/VARIANTS.md b/VARIANTS.md
index 58dd107..5056dbe 100644
--- a/VARIANTS.md
+++ b/VARIANTS.md
@@ -37,3 +37,5 @@
 |                                | `oem`      | `Python-Classroom-Disk`               |
 |                                | `oem`      | `Python-Classroom-Vagrant-libvirt`    |
 |                                | `oem`      | `Python-Classroom-Vagrant-VirtualBox` |
+| Phosh Spin                     | `iso`      | `Phosh-Desktop-Live`                  |
+|                                | `oem`      | `Phosh-Desktop-Disk`                  |
diff --git a/components/desktops/phosh.xml b/components/desktops/phosh.xml
index fe1456a..7362244 100644
--- a/components/desktops/phosh.xml
+++ b/components/desktops/phosh.xml
@@ -5,10 +5,11 @@
 		</profile>
 	</profiles>
 	<packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Desktop">
-		<package name="fedora-release-phosh"/>
+		<package name="fedora-release-mobility"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop">
 		<!-- install env-group to resolve RhBug:1891500 -->
 		<namedCollection name="phosh-desktop-environment"/>
+	        <package name="initial-setup-gui-wayland-generic"/>
 	</packages>
 </image>
diff --git a/teams/phosh.xml b/teams/phosh.xml
new file mode 100644
index 0000000..ce5e920
--- /dev/null
+++ b/teams/phosh.xml
@@ -0,0 +1,15 @@
+<image>
+	<profiles>
+		<profile name="Phosh-Live" description="Phosh Spin Live DVD">
+			<requires profile="Phosh-Desktop"/>
+			<requires profile="LiveInstall"/>
+		</profile>
+		<profile name="Phosh-Disk" description="Phosh Spin Install Disk">
+			<requires profile="BootDiskCore"/>
+			<requires profile="Phosh-Desktop"/>
+		</profile>
+	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Disk,Phosh-Live">
+		<package name="fedora-release-mobility"/>
+	</packages>
+</image>