diff --git a/fedora-disk-workstation.ks b/fedora-disk-workstation.ks
new file mode 100644
index 0000000..8ca93a7
--- /dev/null
+++ b/fedora-disk-workstation.ks
@@ -0,0 +1,15 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-workstation-common.ks
+
+bootloader --append="cma=256MB"
+
+%packages
+-initial-setup
+-initial-setup-gui
+
+%end
+
+%post
+
+%end
diff --git a/fedora-disk-xbase.ks b/fedora-disk-xbase.ks
new file mode 100644
index 0000000..b0409ac
--- /dev/null
+++ b/fedora-disk-xbase.ks
@@ -0,0 +1,21 @@
+%packages
+@base-x
+@fonts
+@input-methods
+@multimedia
+@printing
+-@guest-desktop-agents
+
+# Need aajohan-comfortaa-fonts for the SVG rnotes images
+aajohan-comfortaa-fonts
+
+# anaconda needs the locales available to run for different locales
+glibc-all-langpacks
+
+%end
+
+%post
+# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
+
+%end