diff --git a/iso/installer/rc.local.install b/iso/installer/rc.local.install
index f1634564..5f0962f1 100755
--- a/iso/installer/rc.local.install
+++ b/iso/installer/rc.local.install
@@ -1,3 +1,3 @@
 #!/bin/bash
-plymouth --quit
+#plymouth --quit
 openvt -f -w -s /root/installer/wrapper.sh
diff --git a/iso/preseed/tpot.seed b/iso/preseed/tpot.seed
index 712750aa..e897c49a 100755
--- a/iso/preseed/tpot.seed
+++ b/iso/preseed/tpot.seed
@@ -13,7 +13,7 @@ d-i localechooser/preferred-locale string en_US.UTF-8
 ######################
 ### Keyboard Selection
 ######################
-#d-i console-setup/ask_detect boolean true
+d-i console-setup/ask_detect boolean true
 #d-i keyboard-configuration/layoutcode string de
 d-i console-setup/detected note
 
@@ -28,6 +28,7 @@ d-i console-setup/detected note
 #d-i netcfg/choose_interface select auto
 #d-i netcfg/dhcp_timeout string 60
 d-i netcfg/get_hostname string t-pot
+d-i netcfg/get_domain string
 
 ###############
 ### Disk Layout
@@ -74,19 +75,28 @@ d-i mirror/http/hostname string deb.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
+###################
+# Suite to install
+###################
+d-i mirror/suite string testing
+#d-i mirror/udeb/suite string testing
+
+######
+
 ###########################
 ### Skip Grub Configuration
 ###########################
 #d-i grub-installer/confirm boolean true
-#d-i grub-installer/only_debian boolean true
+d-i grub-installer/only_debian boolean true
 #d-i grub-installer/with_other_os boolean true
-d-i grub-installer/skip boolean true
+#d-i grub-installer/skip boolean true
+d-i grub-installer/bootdev string default
 d-i lilo-installer/skip boolean true
 
 ######################
 ### Time Configuration
 ######################
-#d-i time/zone string Europe/Berlin
+##d-i time/zone string Europe/Berlin
 d-i clock-setup/utc boolean true
 d-i time/zone string UTC
 d-i clock-setup/ntp boolean true
@@ -95,12 +105,14 @@ d-i clock-setup/ntp-server string debian.pool.ntp.org
 ##################
 ### Package Groups
 ##################
-tasksel tasksel/first multiselect ssh-server
+tasksel tasksel/first multiselect standard, ssh-server
 
 ########################
 ### Package Installation
 ########################
 d-i pkgsel/include string apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc html2text htop iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip unzip vim wireless-tools wpasupplicant
+popularity-contest popularity-contest/participate boolean false
+
 
 #################
 ### Update Policy
@@ -117,9 +129,9 @@ d-i debian-installer/splash boolean false
 ### Post install (Grub & T-Pot Installer)
 #########################################
 d-i preseed/late_command string \
-in-target apt-get -y install grub-pc; \
-in-target grub-install --force $(debconf-get partman-auto/disk); \
-in-target update-grub; \
+#in-target apt-get -y install grub-pc; \
+#in-target grub-install --force $(debconf-get partman-auto/disk); \
+#in-target update-grub; \
 in-target git clone https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot; \
 cp /target/opt/tpot/iso/installer/rc.local.install /target/etc/rc.local; \
 cp /target/opt/tpot/iso/installer -R /target/root/;