diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index 64529c7..6142e2e 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -2,8 +2,11 @@ ssh less fbset sudo psmisc strace ed ncdu
 console-setup keyboard-configuration debconf-utils parted
 build-essential manpages-dev bash-completion gdb pkg-config
 python-is-python3
-python3-rpi.gpio v4l-utils
+v4l-utils
+python3-libgpiod
 python3-gpiozero
+pigpio python3-pigpio raspi-gpio python3-rpi.gpio
+python3-spidev
 avahi-daemon
 lua5.1
 luajit
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index bfb3f0d..567f3ce 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -11,8 +11,6 @@ tree
 libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
 geany
 piclone
-pigpio python3-pigpio raspi-gpio python3-rpi.gpio
-python3-spidev
 python3-twython
 python3-smbus
 python3-flask