diff --git a/Containerfile b/Containerfile
index 5c44fd22..4f11ad14 100644
--- a/Containerfile
+++ b/Containerfile
@@ -168,7 +168,8 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         gnome-shell-extension-blur-my-shell \
         gnome-shell-extension-hanabi \
         gnome-shell-extension-gamerzilla \
-        rom-properties-gtk3 && \
+        rom-properties-gtk3 \
+        openssh-askpass && \
     rpm-ostree override remove \
         gnome-classic-session \
         gnome-tour \
diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
index b532582a..c7a8ef48 100644
--- a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -21,7 +21,7 @@ screens:
           description: Adds the input group to your current user. Required by certain controller drivers.
           default: true
           packages:
-          - Set input group: pkexec ujust add-user-to-input-group
+          - Set input group: sudo -A ujust add-user-to-input-group
         Add Nested Desktop to Steam:
           description: Adds a nested desktop environment to Steam gamemode.
           default: true
@@ -31,7 +31,7 @@ screens:
           description: Enables BIOS &amp; Firmware updates for Steam Deck hardware
           default: true
           packages:
-          - Enable Updates: pkexec ujust enable-deck-bios-firmware-updates
+          - Enable Updates: sudo -A ujust enable-deck-bios-firmware-updates
         BoilR:
           description: Adds games from various clients to Steam
           default: false
@@ -41,7 +41,7 @@ screens:
           description: A plugin loader for the Steam Deck
           default: false
           packages:
-          - Retrieve Decky: pkexec ujust get-decky
+          - Retrieve Decky: sudo -A ujust get-decky
         EmuDeck:
           description: |
             A utility for installing and configuring emulators on the Steam Deck
@@ -58,7 +58,7 @@ screens:
             NOTE: Press the escape key before boot to show the menu
           default: true
           packages:
-          - Hide GRUB: pkexec ujust hide-grub
+          - Hide GRUB: sudo -A ujust hide-grub
         Legacy Memory Configuration (Not recommended):
           description: Disable ZRAM and enable adjustable swap file, defaults to 1GB.
           default: false
@@ -69,7 +69,7 @@ screens:
           description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible
           default: false
           packages:
-          - Install Nix Package Support: pkexec ujust install-nix
+          - Install Nix Package Support: sudo -A ujust install-nix
           - Install Fleek (Requires Nix): ujust install-fleek
         Oversteer:
           description: Application to control supported steering wheels
@@ -115,7 +115,7 @@ screens:
           description: Disable BTRFS support for SD cards for direct compatibility with SD cards formatted on stock SteamOS (Not recommended).
           default: false
           packages:
-          - Switch SteamOS-BTRFS config to EXT4: pkexec ujust switch-to-ext4
+          - Switch SteamOS-BTRFS config to EXT4: sudo -A ujust switch-to-ext4
   applications:
     source: yafti.screen.package
     values:
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just b/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
index 9743d001..77d4de2e 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
@@ -362,7 +362,7 @@ resize-zram:
       if grep -q "zram-size" <<< $(cat ${CONFIG}); then
         sudo sed -i 's/zram-size='${CURRENT_SIZE}'/zram-size='${NEW_SIZE}'/g' ${CONFIG}
       else
-        sudo echo "zram-size=${NEW_SIZE}" >> ${CONFIG}
+        sudo -A echo "zram-size=${NEW_SIZE}" >> ${CONFIG}
       fi
       echo 'Current size: '${NEW_SIZE}'. Please reboot.'
     else
diff --git a/system_files/desktop/shared/usr/etc/profile.d/askpass.sh b/system_files/desktop/shared/usr/etc/profile.d/askpass.sh
new file mode 100755
index 00000000..a1d514e4
--- /dev/null
+++ b/system_files/desktop/shared/usr/etc/profile.d/askpass.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+IMAGE_INFO="/usr/share/ublue-os/image-info.json"
+BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
+
+if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
+  SUDO_ASKPASS='/usr/bin/ksshaskpass'
+elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+  SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
+fi
+export SUDO_ASKPASS
diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
index 51ffba79..3d3ed58e 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -35,7 +35,7 @@ screens:
           description: Adds the input group to your current user. Required by certain controller drivers.
           default: true
           packages:
-          - Set input group: pkexec ujust add-user-to-input-group
+          - Set input group: sudo -A ujust add-user-to-input-group
         Greenlight:
           description: A utility for xCloud and xHome streaming
           default: false
@@ -45,7 +45,7 @@ screens:
           description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible
           default: false
           packages:
-          - Install Nix Package Support: pkexec ujust install-nix
+          - Install Nix Package Support: sudo -A ujust install-nix
           - Install Fleek (Requires Nix): ujust install-fleek
         OpenRazer:
           description: Enables additional capabilities for Razer Hardware