diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix
index 1d93c0de..b828a220 100644
--- a/modules/nixos/cspark-desktop-niri/home.nix
+++ b/modules/nixos/cspark-desktop-niri/home.nix
@@ -101,7 +101,7 @@ fi
       _JAVA_AWT_WM_NONREPARENTING = "1";
       SSH_ASKPASS_REQUIRE = "force";
       #SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      SSH_ASKPASS = "/run/current-system/sw/bin/pinentry-gnome3";
+      SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass";
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix
index cb684858..09e6dccf 100644
--- a/modules/nixos/cspark-desktop-niri/module.nix
+++ b/modules/nixos/cspark-desktop-niri/module.nix
@@ -45,8 +45,13 @@ in
       lxappearance # Manage GTK Themes
       kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc
       #lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents - Issues compiling
-      pinentry-gnome3
+
       zenity # Display custom prompts
+      (writeShellScriptBin "zenity-askpass"
+        ''
+	zenity --password
+       '')
+
       pavucontrol # Audio control
       pipewire.jack
 
@@ -61,7 +66,7 @@ in
       		export _JAVA_AWT_WM_NONREPARENTING="1"
       		export SSH_ASKPASS_REQUIRE="force"
       		# export SSH_ASKPASS="/run/current-system/sw/bin/lxqt-openssh-askpass"
-      		export SSH_ASKPASS="/run/current-system/sw/bin/pinentry-gnome3"
+      		export SSH_ASKPASS="/run/current-system/sw/bin/zenity-askpass"
       		export MOZ_ENABLE_WAYLAND="1"
       		# Enable native wayland support for chromium and electron based applications
       		export NIXOS_OZONE_WL="1"
@@ -164,7 +169,7 @@ in
     programs.ssh = {
       enableAskPassword = true;
       #askPassword = "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      askPassword = "/run/current-system/sw/bin/pinentry-gnome3";
+      askPassword = "/run/current-system/sw/bin/zenity-askpass";
     };
 
     environment.sessionVariables = {
@@ -177,7 +182,7 @@ in
       _JAVA_AWT_WM_NONREPARENTING = "1";
       SSH_ASKPASS_REQUIRE = "force";
       #SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      SSH_ASKPASS = "/run/current-system/sw/bin/pinentry-gnome3";
+      SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass";
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
@@ -195,7 +200,7 @@ in
       _JAVA_AWT_WM_NONREPARENTING = "1";
       SSH_ASKPASS_REQUIRE = "force";
       #SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/lxqt-openssh-askpass";
-      SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/pinentry-gnome3";
+      SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/zenity-askpass";
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";