diff --git a/steps/50-configure.step b/steps/50-configure.step
index 0ec3edc..20e1f5c 100755
--- a/steps/50-configure.step
+++ b/steps/50-configure.step
@@ -4,15 +4,19 @@ echo "~> generating fstab"
 genfstab -U /mnt >> /mnt/etc/fstab
 
 echo "~> Choosing 'Europe/Berlin' as timezone and syncing hardware clock"
-arch-chroot "/mnt ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime"
-arch-chroot "/mnt hwclock --systohc"
+arch-chroot /mnt "ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime"
+arch-chroot /mnt "hwclock --systohc"
 
 echo "~> Overwriting locale.gen and generate en_US and de_DE"
-arch-chroot "/mnt echo -e 'en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8' > /etc/locale.gen"
-arch-chroot "/mnt locale-gen"
-arch-chroot "/mnt echo 'LANG=de_DE.UTF-8' > /etc/locale.conf"
-arch-chroot "/mnt echo 'KEYMAP=de-latin1' > /etc/vconsole.conf"
+arch-chroot /mnt "echo -e 'en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8' > /etc/locale.gen"
+arch-chroot /mnt "locale-gen"
+arch-chroot /mnt "echo 'LANG=de_DE.UTF-8' > /etc/locale.conf"
+arch-chroot /mnt "echo 'KEYMAP=de-latin1' > /etc/vconsole.conf"
 
 echo -e "~> Choose a hostname: "
 read hostname
-arch-chroot "/mnt echo $hostname > /etc/hostname"
+arch-chroot /mnt "echo $hostname > /etc/hostname"
+
+echo "~> Configuring 'grub'"
+arch-chroot /mnt "grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=Arch_GRUB"
+arch-chroot /mnt "grub-mkconfig -o /boot/grub/grub.cfg"