diff --git a/defaults/main.yml b/defaults/main.yml
index 3569ff6..b1ac1c8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,3 +16,7 @@ debian_nonfree_firmware: true
 
 debian_live_debian_installer: netinst
 live_build_directory: /opt/live
+
+live_build_desktop: false
+
+live_build_iso_publisher: custom
diff --git a/tasks/config.yaml b/tasks/config.yaml
index baba4ed..112680a 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -44,6 +44,8 @@
     --firmware-binary true
     {% endif %}
     {% endif %}
+
+    --iso-publisher "{{ live_build_iso_publisher }}"
   args:
     chdir: "{{ live_build_directory }}"
 
@@ -62,12 +64,13 @@
   template:
     src: config/package-lists/desktop.list.chroot.j2
     dest: "{{ live_build_directory }}/config/package-lists/desktop.list.chroot"
+  when: "{{ live_build_desktop }}"
 
 - name: include custom packages
   template:
     src: config/package-lists/custom.list.chroot.j2
     dest: "{{ live_build_directory }}/config/package-lists/custom.list.chroot"
-  when: live_build_custom_packages is defined
+  when: "{{ live_build_custom_packages is defined }}"
 
 - name: debian-installer installer includes directory
   file:
diff --git a/tasks/setup.yaml b/tasks/setup.yaml
index 6dd2643..b8cddee 100644
--- a/tasks/setup.yaml
+++ b/tasks/setup.yaml
@@ -3,5 +3,4 @@
   apt:
     pkg:
       - live-build
-      - memtest86
       - memtest86+