diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b6ac42c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "fedora-kickstarts"]
+	path = fedora-kickstarts
+	url = https://pagure.io/fedora-kickstarts.git
diff --git a/fedora-kickstarts b/fedora-kickstarts
new file mode 160000
index 0000000..879a7d7
--- /dev/null
+++ b/fedora-kickstarts
@@ -0,0 +1 @@
+Subproject commit 879a7d74092f9d324d9488f981cab625f557d6b4
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 6dca77d..e91bc97 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -34,7 +34,7 @@ kernel-modules-extra
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
 # for now.
 #memtest86+
-@x86-baremetal-tools # memtest86+ is included
+#@x86-baremetal-tools # memtest86+ is included
 
 # The point of a live image is to install
 anaconda