diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index c988a6bb..72df7f8f 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -50,14 +50,6 @@ JobRunningTimeoutSec=0s
 Wants=subiquity_config.mount
 EOF
 
-AUTOINSTALL_DEVICE_UNIT='dev-disk-by\x2dlabel-autoinstall.device'
-mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$AUTOINSTALL_DEVICE_UNIT.d"
-cat > "$INSTALLER_ROOT/etc/systemd/system/$AUTOINSTALL_DEVICE_UNIT.d/override.conf" <<EOF
-[Unit]
-JobRunningTimeoutSec=0s
-Wants=subiquity_autoinstall.mount
-EOF
-
 # Prepare installer layer.
 
 # Install:
@@ -88,18 +80,6 @@ snap_preseed $INSTALLER_ROOT subiquity/classic
 # Drop lxd from the installer layer preseed
 sed -i -e'N;/name: lxd/,+2d' $INSTALLER_ROOT/var/lib/snapd/seed/seed.yaml
 
-# Add initramfs hook to copy /autoinstall.yaml from initrd
-# /run/initrd-autoinstall.yaml
-cat <<EOF > "$INSTALLER_ROOT"/etc/initramfs-tools/scripts/init-bottom/copy-autoinstall
-#!/bin/sh
-case \$1 in
-prereqs) exit 0;;
-esac
-
-[ -f /autoinstall.yaml ] && cp /autoinstall.yaml /run/initrd-autoinstall.yaml
-EOF
-chmod +x "$INSTALLER_ROOT"/etc/initramfs-tools/scripts/init-bottom/copy-autoinstall
-
 teardown_mountpoint "$INSTALLER_ROOT"
 
 squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount
deleted file mode 100644
index ae45838e..00000000
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount
+++ /dev/null
@@ -1,4 +0,0 @@
-[Mount]
-What=/dev/disk/by-label/autoinstall
-Where=/autoinstall
-Type=ext4