diff --git a/tasks/config.yaml b/tasks/config.yaml
index 504c39f..9a8f8e6 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -14,7 +14,35 @@
 - name: lb config
   command:
     lb config
-    {{ lookup('template','lb-config-args.j2') }}
+
+    {% if live_build_distribution is defined %}
+    --distribution "{{ live_build_distribution }}"
+    {% endif %}
+
+    --mirror-bootstrap "{{ debian_mirror }}"
+    --mirror-chroot-security "{{ debian_security_mirror }}"
+    --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 %}
+    --bootappend-live "{{ live_build_bootappend_live }}"
+    {% endif %}
+
+    {% if (debian_backports is defined) and (debian_backports == true)  %}
+    --backports true
+    {% endif %}
+
+    {% if debian_live_debian_installer is defined %}
+    --debian-installer "{{ debian_live_debian_installer }}"
+    {% if debian_nonfree_firmware %}
+    --firmware-binary true
+    {% endif %}
+    {% endif %}
   args:
     chdir: "{{ live_build_directory }}"
 
diff --git a/tasks/setup.yaml b/tasks/setup.yaml
index 3d3d839..6dd2643 100644
--- a/tasks/setup.yaml
+++ b/tasks/setup.yaml
@@ -1,9 +1,7 @@
 ---
-- name: install apt packages
+- name: debian packages
   apt:
-    pkg: "{{ item }}"
-    state: installed
-  with_items:
-    - live-build
-    - memtest86
-    - memtest86+
+    pkg:
+      - live-build
+      - memtest86
+      - memtest86+