diff --git a/tasks/nspawn_cache.yml b/tasks/nspawn_cache.yml
index 326c999..d75c31a 100644
--- a/tasks/nspawn_cache.yml
+++ b/tasks/nspawn_cache.yml
@@ -93,9 +93,3 @@
   with_items: "{{ (nspawn_copy_from_host | union(nspawn_container_cache_files_from_host)) | list }}"
   when:
     - nspawn_image_cache_refresh | bool
-
-- name: Create static MACs in the container
-  copy:
-    src: "/etc/systemd/network/99-default.link"
-    dest: "/var/lib/machines/{{ nspawn_container_base_name }}/etc/systemd/network/99-default.link"
-    remote_src: true
diff --git a/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2 b/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2
index 90a5425..4f589d9 100644
--- a/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2
+++ b/templates/prep-scripts/nspawn_ubuntu_prep.sh.j2
@@ -28,8 +28,10 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get remove -y --purge snap* nspawn* lxd* resolvconf || true
 apt-get update
 
-apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ nspawn_container_distro_required_packages | join(' ') }}
+apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes eatmydata
+export LD_PRELOAD=/usr/lib/{{ ansible_architecture }}-linux-gnu/libeatmydata.so
 
+apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ nspawn_container_distro_required_packages | join(' ') }}
 apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ nspawn_container_distro_packages | join(' ') }}
 apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
 apt-get clean