diff --git a/anaconda-ks.cfg b/anaconda-ks.cfg
new file mode 100644
index 0000000..085e085
--- /dev/null
+++ b/anaconda-ks.cfg
@@ -0,0 +1,51 @@
+#version=DEVEL
+# System authorization information
+auth --enableshadow --passalgo=sha512
+# Use graphical install
+graphical
+# Run the Setup Agent on first boot
+firstboot --enable
+ignoredisk --only-use=sda
+# Keyboard layouts
+keyboard --vckeymap=us --xlayouts='us'
+# System language
+lang en_US.UTF-8
+
+# Network information
+network  --bootproto=dhcp --device=eth0 --ipv6=auto --activate
+network  --hostname=localhost.localdomain
+
+repo --name="updates" --baseurl=http://mirror.neostrada.nl/centos/7/updates/x86_64
+repo --name="extras" --baseurl=http://mirror.neostrada.nl/centos/7/extras/x86_64
+# Use network installation
+url --url="http://mirror.neostrada.nl/centos/7/os/x86_64"
+# Root password
+rootpw --iscrypted $6$qXL2KqjfAifpN4cd$/4rPIgneuC9zp1txG2I5oZweQ5a6uR26vOS7AL3omMu/.ltngwTl2CpmhnTsrCK.UZocsSCVSNNHPqQt4a3q2.
+# System services
+services --enabled="chronyd"
+# System timezone
+timezone Europe/Amsterdam --isUtc
+user --groups=wheel --name=michael --password=$6$lBwfauss1lvq7Uwp$agWB1VHqOkd6EafBmC6pESJq8/q6XhpoplIlAKyBtrBx3/cDFiUjeGEXTIus0DFfQGrAbICTSzuyXsB6dyqFG0 --iscrypted --gecos="michael"
+# System bootloader configuration
+bootloader --append=" crashkernel=auto" --location=mbr --boot-drive=sda
+autopart --type=lvm
+# Partition clearing information
+clearpart --none --initlabel
+
+%packages
+@^minimal
+@core
+chrony
+kexec-tools
+
+%end
+
+%addon com_redhat_kdump --enable --reserve-mb='auto'
+
+%end
+
+%anaconda
+pwpolicy root --minlen=6 --minquality=1 --notstrict --nochanges --notempty
+pwpolicy user --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
+pwpolicy luks --minlen=6 --minquality=1 --notstrict --nochanges --notempty
+%end
diff --git a/kickstart.ks b/kickstart.ks
index 09d49b8..43dacbd 100644
--- a/kickstart.ks
+++ b/kickstart.ks
@@ -2,22 +2,22 @@
 install
 text
 lang en_US.UTF-8
-keyboard us
+keyboard --vckeymap=us --xlayouts='us'
 timezone Europe/Amsterdam --isUtc
 auth --useshadow --passalgo=sha256
 firewall --disabled
 services --enabled=sshd
 eula --agreed
 
+ignoredisk --only-use=sda
+bootloader --append=" crashkernel=auto" --location=mbr --boot-drive=sda
+autopart --type=lvm
+# Partition clearing information
+clearpart --none --initlabel
+
+
 %pre
 #!/bin/bash
-DISK=$(lsblk --output NAME,TYPE | grep disk | head -n1 | cut -d" " -f1)
-cat > /tmp/setup << EOF
-clearpart --all --initlabel
-bootloader --location=mbr --boot-drive=$DISK
-zerombr
-autopart
-EOF
 
 NET_CFG=$(grep -oE 'net_cfg=#.*#' < /proc/cmdline)
 HOST_NAME=${HOST_NAME##*=}
@@ -41,8 +41,6 @@ else
 fi
 %end
 
-%include /tmp/setup
-
 rootpw $1$ShWUmTPa$n1yOej8jz.ZuOpaFNC2Vt0 --iscrypted
 
 ## repos
@@ -54,7 +52,10 @@ repo --name=epel --baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/
 url --url="http://mirror.neostrada.nl/centos/7/os/x86_64/"
 
 %packages
+@^minimal
 @core
+chrony
+kexec-tools
 bash-completion
 epel-release
 deltarpm