diff --git a/anaconda/data/post-scripts/60-systemd-preset.ks b/anaconda/data/post-scripts/60-systemd-preset.ks
new file mode 100644
index 0000000..18de26d
--- /dev/null
+++ b/anaconda/data/post-scripts/60-systemd-preset.ks
@@ -0,0 +1,9 @@
+%post
+
+# preset all services, to not worry about package installation order (preset
+# files vs services)
+systemctl preset-all
+
+systemctl enable initial-setup.service
+
+%end
diff --git a/anaconda/data/post-scripts/Makefile.am b/anaconda/data/post-scripts/Makefile.am
index f7ec8cc..8b0c946 100644
--- a/anaconda/data/post-scripts/Makefile.am
+++ b/anaconda/data/post-scripts/Makefile.am
@@ -18,5 +18,5 @@
 # Author: Chris Lumens <clumens@redhat.com>
 
 postscriptsdir = $(datadir)/$(PACKAGE_NAME)/post-scripts
-dist_postscripts_DATA = 40-qubes-alt-kernels.ks 50-qubes.ks 80-setfilecons.ks 90-copy-screenshots.ks 99-copy-logs.ks
+dist_postscripts_DATA = 40-qubes-alt-kernels.ks 50-qubes.ks 60-systemd-preset.ks 80-setfilecons.ks 90-copy-screenshots.ks 99-copy-logs.ks
 MAINTAINERCLEANFILES = Makefile.in