diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/70-install-command-not-found.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/70-install-command-not-found.sh
deleted file mode 100644
index f08ca73..0000000
--- a/fix-raspian-defaults/root.overlay/boot/per-once.d/70-install-command-not-found.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-apt update
-apt -y install command-not-found
-apt-file update
-update-command-not-found
diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt b/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
index 5f30412..de9352f 100644
--- a/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
+++ b/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
@@ -1,7 +1,9 @@
 apt-transport-https
 bash-completion
 build-essential
+bundler
 byobu
+bzr
 ca-certificates
 command-not-found
 cryptsetup-bin
@@ -9,9 +11,12 @@ curl
 daemontools
 dirmngr
 dnsutils
+git
 gnupg-agent
 gnupg2
+golang
 haveged
+httpie
 inetutils-ping
 iptables-persistent
 iptraf-ng
@@ -19,13 +24,17 @@ jq
 less
 lsof
 man-db
+mercurial
 mosh
 nmap
+nodejs
+npm
 ntp
 opensc
 pbzip2
 pcscd
 pinentry-curses
+pipenv
 pv
 rsync
 runit
@@ -34,6 +43,7 @@ scdaemon
 screen
 socat
 software-properties-common
+subversion
 usbmount
 vim
 wget