diff --git a/Makefile.am b/Makefile.am
index 3864a65..5291c61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,17 @@ fedoradir = $(pkgdatadir)/
 fedora_DATA = \
     fedora-aos.ks \
     fedora-arm-base.ks \
-    fedora-arm-minimal.ks \
-    fedora-arm-xfce.ks \
     fedora-arm-lxde.ks \
+    fedora-arm-lxde-vfat.ks \
+    fedora-arm-minimal.ks \
+    fedora-arm-minimal-vfat.ks \
+    fedora-arm-partitioning.ks \
+    fedora-arm-soas.ks \
+    fedora-arm-soas-vfat.ks \
+    fedora-arm-vfat-partitioning.ks \
     fedora-arm-xbase.ks \
+    fedora-arm-xfce.ks \
+    fedora-arm-xfce-vfat.ks \
     fedora-install-fedora.ks \
     fedora-live-base.ks \
     fedora-live-minimization.ks \
diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index eae3c15..bbb5ebc 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -7,10 +7,6 @@ firewall --enabled --service=mdns,ssh
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
-bootloader --location=none
-part /boot --size=512 --fstype ext3
-part swap --size=512 --fstype swap
-part / --grow --size=6500 --fstype ext4
 services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=network
 
 repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
diff --git a/fedora-arm-lxde-vfat.ks b/fedora-arm-lxde-vfat.ks
new file mode 100644
index 0000000..3c18eac
--- /dev/null
+++ b/fedora-arm-lxde-vfat.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-lxde-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end
diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks
index 28a4a74..d0804ea 100644
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-lxde-packages.ks
+%include fedora-arm-partitioning.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"
diff --git a/fedora-arm-minimal-vfat.ks b/fedora-arm-minimal-vfat.ks
new file mode 100644
index 0000000..2f7f2dd
--- /dev/null
+++ b/fedora-arm-minimal-vfat.ks
@@ -0,0 +1,17 @@
+%include fedora-arm-base.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+echo -n "Enabling initial-setup text mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
+echo .
+
+%end
+
diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks
index 588ee40..8ed64eb 100644
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,5 +1,5 @@
 %include fedora-arm-base.ks
-
+%include fedora-arm-partitioning.ks
 
 %post
 
diff --git a/fedora-arm-partitioning.ks b/fedora-arm-partitioning.ks
new file mode 100644
index 0000000..4fc393d
--- /dev/null
+++ b/fedora-arm-partitioning.ks
@@ -0,0 +1,5 @@
+bootloader --location=none
+part /boot --size=512 --fstype ext3
+part swap --size=512 --fstype swap
+part / --grow --size=6500 --fstype ext4
+
diff --git a/fedora-arm-soas-vfat.ks b/fedora-arm-soas-vfat.ks
new file mode 100644
index 0000000..d736cb5
--- /dev/null
+++ b/fedora-arm-soas-vfat.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-soas-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end
diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks
new file mode 100644
index 0000000..dc69b9c
--- /dev/null
+++ b/fedora-arm-soas.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-soas-packages.ks
+%include fedora-arm-partitioning.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end
diff --git a/fedora-arm-vfat-partitioning.ks b/fedora-arm-vfat-partitioning.ks
new file mode 100644
index 0000000..a448344
--- /dev/null
+++ b/fedora-arm-vfat-partitioning.ks
@@ -0,0 +1,5 @@
+bootloader --location=none
+part /boot/uboot --size=20 --fstype vfat
+part swap --size=512 --fstype swap
+part / --grow --size=6500 --fstype ext4
+
diff --git a/fedora-arm-xfce-vfat.ks b/fedora-arm-xfce-vfat.ks
new file mode 100644
index 0000000..ba42ac7
--- /dev/null
+++ b/fedora-arm-xfce-vfat.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-xfce-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end
diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks
index 5923c6b..7594d9f 100644
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -1,6 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
+%include fedora-arm-partitioning.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"