diff --git a/modules/nixos/hardware/uconsole-cm5-aio-v2.nix b/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
index a216da7..7b16cb0 100644
--- a/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
+++ b/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
@@ -21,7 +21,7 @@ let
   applyRailsScript = pkgs.writeShellScript "apply-aio-v2-rails" (
     ''
       set -e
-      PINCTRL=${pkgs.raspberrypi-tools}/bin/pinctrl
+      PINCTRL=${pkgs.libraspberrypi}/bin/pinctrl
     ''
     + concatStringsSep "" (mapAttrsToList (name: pin: ''
       if [ "${if cfg.bootRails.${name} then "1" else "0"}" = "1" ]; then
@@ -123,7 +123,7 @@ in {
     # Package the aiov2_ctl tool + pinctrl
     environment.systemPackages = with pkgs; [
       cfg.package
-      raspberrypi-tools   # provides pinctrl
+      libraspberrypi      # provides pinctrl
     ];
 
     # Boot rail systemd oneshot service