diff --git a/home/common/default.nix b/home/common/default.nix
index 64625a4..cfb3721 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -77,7 +77,7 @@
     nmap
     notmuch
     pandoc
-    pinentry
+    pinentry-curses
     pipx
     ps_mem
     psmisc
diff --git a/home/common/pi-server.nix b/home/common/pi-server.nix
index 84d9435..023dd6a 100644
--- a/home/common/pi-server.nix
+++ b/home/common/pi-server.nix
@@ -31,7 +31,7 @@
     moreutils
     ncdu
     nmap
-    pinentry
+    pinentry-curses
     pipx
     ps_mem
     psmisc
diff --git a/hosts/server/default.nix b/hosts/server/default.nix
index 924a369..6e3f469 100644
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -181,7 +181,7 @@ in {
     nixfmt-classic
     pkg-config
     podman
-    poppler_utils
+    poppler-utils
     ruby
     sops
     udiskie
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index 765952a..d9518f9 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -308,7 +308,7 @@ in {
     isync
     pkg-config
     playerctl
-    poppler_utils
+    poppler-utils
     pulseaudio
     ruby
     sops