diff --git a/iso/preseeds/ubuntu/autoinstall_unattended.yaml b/iso/preseeds/ubuntu/autoinstall_unattended.yaml
index 151cb39..8878db0 100644
--- a/iso/preseeds/ubuntu/autoinstall_unattended.yaml
+++ b/iso/preseeds/ubuntu/autoinstall_unattended.yaml
@@ -46,28 +46,22 @@ autoinstall:
     # By default, the password is allowed if no authorized keys are provided
 
   packages:
-#    - chrony 
-    - openssh-server
-    - vim
-    - sudo
-#    - build-essential # TODO: FIX
+    - openssh-server # TODO: Remove?
+    - vim # TODO: Remove?
+    - sudo # TODO: Remove?
     - linux-generic
-#    - iw # TODO: FIX
-#    - iwd
     - wpasupplicant
     - intel-microcode
     - iucode-tool
-#    - firmware-misc-nonfree # TODO: Remove?
-#    - firmware-iwlwifi # TODO: Remove?
-#    - avahi-utils # TODO: Fix
-    - iptables # TODO: Try
+    - iptables
   timezone: UTC
 
   late-commands:
-    - "apt update && apt install -y chrony build-essential iw iwd avahi-utils || true"
+    - "curtin in-target --target=/target -- apt update && apt install -y chrony build-essential iw iwd avahi-utils"
     - "mkdir -p /target/usr/src/dappnode"
     - "cp -ar /cdrom/dappnode/* /target/usr/src/dappnode/"
     - "cp -a /cdrom/dappnode/scripts/rc.local /target/etc/rc.local"
     - "chmod +x /target/usr/src/dappnode/scripts/dappnode_install_pre.sh"
-    - "echo 'touch /target/usr/src/dappnode/.firstboot'"
-    - "/target/usr/src/dappnode/scripts/dappnode_install_pre.sh UPDATE > /target/usr/src/dappnode/scripts/dappnode_install_pre.log || true"
+    - "touch /target/usr/src/dappnode/.firstboot"
+    - "curtin in-target --target=/target -- /usr/src/dappnode/scripts/dappnode_install_pre.sh UPDATE"
+# TODO: Handle /etc/network/interfaces and /etc/network/devhotplug
\ No newline at end of file