diff --git a/templates/lb-config-args.j2 b/templates/lb-config-args.j2
index e150573..8e6d735 100644
--- a/templates/lb-config-args.j2
+++ b/templates/lb-config-args.j2
@@ -6,6 +6,7 @@
 --mirror-binary "{{ debian_mirror }}"
 --mirror-binary-security "{{ debian_security_mirror }}"
 {% if debian_nonfree_firmware %}
+--archive-areas "main contrib non-free"
 --firmware-chroot true
 {% endif %}
 {% if live_build_bootappend_live is defined %}
diff --git a/templates/preseed.cfg.j2 b/templates/preseed.cfg.j2
index 5efc0a4..2eb775d 100644
--- a/templates/preseed.cfg.j2
+++ b/templates/preseed.cfg.j2
@@ -73,20 +73,19 @@ d-i pkgsel/upgrade select full-upgrade
 # installed, and what software you use. The default is not to report back,
 # but sending reports helps the project determine what software is most
 # popular and include it on CDs.
-popularity-contest popularity-contest/participate boolean false
 
 ### Boot loader installation
 # This is fairly safe to set, it makes grub install automatically to the MBR
 # if no other operating system is detected on the machine.
-d-i grub-installer/only_debian boolean true
+#d-i grub-installer/only_debian boolean true
 
 # This one makes grub-installer install to the MBR if it also finds some other
 # OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
+#d-i grub-installer/with_other_os boolean true
 
 ### Finishing up the installation
 # Avoid that last message about the install being complete.
-d-i finish-install/reboot_in_progress note
+#d-i finish-install/reboot_in_progress note
 
 ### Running custom commands during the installation
 d-i preseed/late_command string DIR=/target/root/.ssh; \
diff --git a/vars/main.yml b/vars/main.yml
index db905b7..a718c6f 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -60,4 +60,7 @@ live_build_desktop_packages:
   - xfce4
   - i3
   - firefox-esr
-  - task-desktop-xfce
+  - task-xfce-desktop
+  - task-german
+  - task-german-desktop
+  - debian-installer-launcher