diff --git a/Containerfile b/Containerfile
index 9d0e5720..1b047a0f 100644
--- a/Containerfile
+++ b/Containerfile
@@ -168,8 +168,7 @@ 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 \
-        openssh-askpass && \
+        rom-properties-gtk3 && \
     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 de89de85..c2b4737e 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
@@ -36,7 +36,7 @@ screens:
           description: A plugin loader for the Steam Deck
           default: false
           packages:
-          - Retrieve Decky: sudo -A just --unstable get-decky
+          - Retrieve Decky: pkexec just --justfile /usr/share/ublue-os/justfile --unstable get-decky
         EmuDeck:
           description: |
             A utility for installing and configuring emulators on the Steam Deck
@@ -53,7 +53,7 @@ screens:
             NOTE: Press the escape key before boot to show the menu
           default: true
           packages:
-          - Hide GRUB: sudo -A just --unstable hide-grub
+          - Hide GRUB: pkexec just --justfile /usr/share/ublue-os/justfile --unstable hide-grub
         Legacy Memory Configuration (Not recommended):
           description: Disable ZRAM and enable adjustable swap file, defaults to 1GB.
           default: false
@@ -64,7 +64,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: sudo -A just --unstable install-nix
+          - Install Nix Package Support: pkexec just --justfile /usr/share/ublue-os/justfile --unstable install-nix
           - Install Fleek (Requires Nix): just --unstable install-fleek
         Oversteer:
           description: Application to control supported steering wheels
@@ -110,7 +110,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: sudo -A just --unstable switch-to-ext4
+          - Switch SteamOS-BTRFS config to EXT4: pkexec just --justfile /usr/share/ublue-os/justfile --unstable 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 1114bdf0..53a5d96e 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
@@ -356,7 +356,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 -A echo "zram-size=${NEW_SIZE}" >> ${CONFIG}
+        sudo 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
deleted file mode 100755
index a1d514e4..00000000
--- a/system_files/desktop/shared/usr/etc/profile.d/askpass.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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 ac22d1f6..0cbf3e3c 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
@@ -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: sudo -A just --unstable install-nix
+          - Install Nix Package Support: pkexec just --justfile /usr/share/ublue-os/justfile --unstable install-nix
           - Install Fleek (Requires Nix): just --unstable install-fleek
         OpenRazer:
           description: Enables additional capabilities for Razer Hardware