diff --git a/teams/budgie.xml b/teams/budgie.xml
index 415f0dd..788ac78 100644
--- a/teams/budgie.xml
+++ b/teams/budgie.xml
@@ -4,8 +4,12 @@
 			<requires profile="Budgie-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Budgie-Disk" description="Budgie Spin Install Disk">
+			<requires profile="Budgie-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Budgie-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Budgie-Live,Budgie-Disk">
 		<package name="fedora-release-budgie"/>
 	</packages>
 </image>
diff --git a/teams/cinnamon.xml b/teams/cinnamon.xml
index db205a3..7087ba1 100644
--- a/teams/cinnamon.xml
+++ b/teams/cinnamon.xml
@@ -4,8 +4,12 @@
 			<requires profile="Cinnamon-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Cinnamon-Disk" description="Cinnamon Spin Install Disk">
+			<requires profile="Cinnamon-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Cinnamon-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Cinnamon-Live,Cinnamon-Disk">
 		<package name="fedora-release-cinnamon"/>
 	</packages>
 </image>
diff --git a/teams/i3.xml b/teams/i3.xml
index fcef4e7..6246674 100644
--- a/teams/i3.xml
+++ b/teams/i3.xml
@@ -4,8 +4,12 @@
 			<requires profile="i3-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="i3-Disk" description="i3 Spin Install Disk">
+			<requires profile="i3-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="i3-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="i3-Live,i3-Disk">
 		<package name="fedora-release-i3"/>
 	</packages>
 </image>
diff --git a/teams/lxde.xml b/teams/lxde.xml
index 3660b2e..526a69c 100644
--- a/teams/lxde.xml
+++ b/teams/lxde.xml
@@ -3,9 +3,13 @@
 		<profile name="LXDE-Live" description="LXDE Spin Live DVD">
 			<requires profile="LXDE-Desktop"/>
 			<requires profile="LiveInstall"/>
+		<profile name="LXDE-Disk" description="LXDE Spin Install Disk">
+			<requires profile="LXDE-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="LXDE-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXDE-Live,LXDE-Disk">
 		<package name="fedora-release-lxde"/>
 	</packages>
 </image>
diff --git a/teams/lxqt.xml b/teams/lxqt.xml
index 41c741e..d8bb678 100644
--- a/teams/lxqt.xml
+++ b/teams/lxqt.xml
@@ -4,8 +4,12 @@
 			<requires profile="LXQt-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="LXQt-Disk" description="LXQt Spin Install Disk">
+			<requires profile="LXQt-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="LXQt-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXQt-Live,LXQt-Disk">
 		<package name="fedora-release-lxqt"/>
 	</packages>
 </image>
diff --git a/teams/mate.xml b/teams/mate.xml
index 5148afb..d7b7f05 100644
--- a/teams/mate.xml
+++ b/teams/mate.xml
@@ -4,8 +4,12 @@
 			<requires profile="MATE-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="MATE_Compiz-Disk" description="MATE-Compiz Spin Install Disk">
+			<requires profile="MATE-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="MATE_Compiz-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="MATE_Compiz-Live,MATE_Compiz-Disk">
 		<package name="fedora-release-matecompiz"/>
 	</packages>
 </image>
diff --git a/teams/soas.xml b/teams/soas.xml
index 31b1bab..d1e7379 100644
--- a/teams/soas.xml
+++ b/teams/soas.xml
@@ -4,8 +4,12 @@
 			<requires profile="SoaS-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="SoaS-Disk" description="Sugar on a Stick Install Disk">
+			<requires profile="SoaS-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="SoaS-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="SoaS-Live,SoaS-Disk">
 		<package name="fedora-release-soas"/>
 	</packages>
 </image>
diff --git a/teams/sway.xml b/teams/sway.xml
index 0ce036e..2888b87 100644
--- a/teams/sway.xml
+++ b/teams/sway.xml
@@ -4,8 +4,12 @@
 			<requires profile="Sway-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Sway-Disk" description="Sway Spin Install Disk">
+			<requires profile="Sway-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live,Sway-Disk">
 		<package name="fedora-release-sway"/>
 	</packages>
 </image>
diff --git a/teams/workstation.xml b/teams/workstation.xml
index fc61499..660de7c 100644
--- a/teams/workstation.xml
+++ b/teams/workstation.xml
@@ -4,8 +4,12 @@
 			<requires profile="GNOME-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Workstation-Disk" description="Workstation Edition Install Disk">
+			<requires profile="GNOME-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Workstation-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Workstation-Live,Workstation-Disk">
 		<package name="fedora-release-workstation"/>
 	</packages>
 </image>
diff --git a/teams/xfce.xml b/teams/xfce.xml
index 09c3d1c..80f3a58 100644
--- a/teams/xfce.xml
+++ b/teams/xfce.xml
@@ -4,8 +4,12 @@
 			<requires profile="Xfce-Desktop"/>
 			<requires profile="LiveInstall"/>
 		</profile>
+		<profile name="Xfce-Disk" description="Xfce Spin Install Disk">
+			<requires profile="Xfce-Desktop"/>
+			<requires profile="BootDiskCore"/>
+		</profile>
 	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Xfce-Live">
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Xfce-Live,Xfce-Disk">
 		<package name="fedora-release-xfce"/>
 	</packages>
 </image>