diff --git a/debian-babelbox.json b/debian-babelbox.json
index 02c6e0a..ea36cad 100644
--- a/debian-babelbox.json
+++ b/debian-babelbox.json
@@ -5,10 +5,8 @@
       "<esc><wait>",
       "install <wait>",
       "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
-      "debian-installer=en_US <wait>",
+      "debian-installer/locale=en_US <wait>",
       "auto <wait>",
-      "locale=en_US <wait>",
-      "kbd-chooser/method=de <wait>",
       "netcfg/get_hostname={{ .Name }} <wait>",
       "netcfg/get_domain=demo.local <wait>",
       "fb=false <wait>",
@@ -19,22 +17,22 @@
       "<enter><wait>"
     ],
     "disk_size": 10240,
-    "guest_os_type": "Debian",
+    "guest_os_type": "Debian_64",
     "hard_drive_interface": "sata",
     "headless": false,
     "http_directory": "http",
-    "iso_checksum": "f270d1ffa0f9472464bfc0fffa7ac3ddc89abb5786eb02454f26e49f143b01d6",
+    "iso_checksum": "6a901b5abe43d88b39d627e1339d15507cc38f980036b928f835e0f0e957d3d8",
     "iso_checksum_type": "sha256",
-    "iso_url": "http://cdimage.debian.org/debian-cd/current/i386/iso-cd/debian-8.3.0-i386-netinst.iso",
+    "iso_url": "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.3.0-amd64-netinst.iso",
     "shutdown_command": "sudo /sbin/halt -p",
     "ssh_username": "demo",
     "ssh_password": "babelbox",
     "ssh_port": "22",
     "ssh_wait_timeout": "1800s",
     "type": "virtualbox-iso",
-    "vm_name": "babelbox-jessie",
+    "vm_name": "babelbox-buster",
     "vboxmanage": [
-      ["modifyvm", "{{.Name}}", "--memory", "512"],
+      ["modifyvm", "{{.Name}}", "--memory", "1024"],
       ["modifyvm", "{{.Name}}", "--cpus", "1"]
     ],
     "output_directory": "babelbox"
diff --git a/http/preseed.cfg b/http/preseed.cfg
index 85dc7ad..f1170ba 100644
--- a/http/preseed.cfg
+++ b/http/preseed.cfg
@@ -69,6 +69,9 @@ d-i partman/confirm_nooverwrite boolean true
 ### Apt setup
 d-i apt-setup/non-free boolean false
 d-i apt-setup/contrib boolean false
+d-i apt-setup/cdrom/set-first boolean false
+d-i apt-setup/cdrom/set-next boolean false
+d-i apt-setup/cdrom/set-failed boolean false
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/services-select multiselect security, updates
 d-i apt-setup/security_host string security.debian.org
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index a853924..0991947 100755
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -1,6 +1,6 @@
 # Clean up
 
-apt-get --yes remove libc6-dev gcc-4.8 gcc-4.9 linux-libc-dev gcc-4.8-base dmidecode laptop-detect
+apt-get --yes remove dmidecode gcc-8 laptop-detect libc6-dev linux-libc-dev
 apt-get --yes autoremove
 apt-get --yes clean
 
diff --git a/scripts/setup-babelbox.sh b/scripts/setup-babelbox.sh
index ca7cf7f..0f8035b 100644
--- a/scripts/setup-babelbox.sh
+++ b/scripts/setup-babelbox.sh
@@ -4,11 +4,18 @@ set -e
 
 apt-get install -y git wget
 cd /srv
-wget http://ftp.debian.org/debian/dists/stable/main/installer-i386/current/images/hd-media/gtk/initrd.gz http://ftp.debian.org/debian/dists/stable/main/installer-i386/current/images/hd-media/gtk/vmlinuz
-git clone https://anonscm.debian.org/git/d-i/babelbox.git
+wget http://ftp.debian.org/debian/dists/stable/main/installer-amd64/current/images/hd-media/gtk/initrd.gz http://ftp.debian.org/debian/dists/stable/main/installer-amd64/current/images/hd-media/gtk/vmlinuz http://ftp.debian.org/debian/pool/main/u/util-linux/fdisk-udeb_2.33.1-0.1_amd64.udeb
+mkdir initrd_with_fdisk
+cd initrd_with_fdisk
+gunzip -c ../initrd.gz | cpio -id
+dpkg-deb -x ../fdisk-udeb_2.33.1-0.1_amd64.udeb .
+find . | cpio --create --format='newc' | gzip -9 > ../initrd.gz
+cd ..
+rm -rf initrd_with_fdisk fdisk-udeb_2.33.1-0.1_amd64.udeb
+git clone https://salsa.debian.org/installer-team/babelbox.git
 cd babelbox
 cat babelbox-grub >> /etc/grub.d/40_custom
 update-grub
 ./cronscript
 
-echo "You need to download a Debian i386 DVD ISO into /srv"
+echo "You need to download a Debian amd64 DVD ISO into /srv"