diff --git a/defaults/initrd.d/00-crypt.sh b/defaults/initrd.d/00-crypt.sh
index 0e7c863..7acad27 100755
--- a/defaults/initrd.d/00-crypt.sh
+++ b/defaults/initrd.d/00-crypt.sh
@@ -199,7 +199,7 @@ _open_luks() {
                 # (either mounted before or not)
                 good_msg "${luks_key} on device ${real_luks_keydev} found"
                 if [ "$(echo ${luks_key} | grep -o '.gpg$')" = ".gpg" ] && \
-                    [ -e /usr/bin/gpg ]; then
+                    [ -e /usr/bin/staticgpg ]; then
 
                     # TODO(lxnay): WTF is this?
                     [ -e /dev/tty ] && mv /dev/tty /dev/tty.org
@@ -207,10 +207,10 @@ _open_luks() {
 
                     cryptsetup_opts="${cryptsetup_opts} -d -"
                     # if plymouth not in use, gpg reads keyfile passphrase...
-                    gpg_tty_cmd="/usr/bin/gpg --logger-file /dev/null"
+                    gpg_tty_cmd="/usr/bin/staticgpg --logger-file /dev/null"
                     gpg_tty_cmd="${gpg_tty_cmd} --quiet --decrypt ${mntkey}${luks_key} | "
                     # but when plymouth is in use, keyfile passphrase piped in
-                    gpg_ply_cmd="/usr/bin/gpg --logger-file /dev/null"
+                    gpg_ply_cmd="/usr/bin/staticgpg --logger-file /dev/null"
                     gpg_ply_cmd="${gpg_ply_cmd} --quiet --passphrase-fd 0 --batch --no-tty"
                     gpg_ply_cmd="${gpg_ply_cmd} --decrypt ${mntkey}${luks_key} | "
                 else
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 57db45b..132ab9b 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -590,7 +590,7 @@ append_gpg() {
     mkdir -p "${TEMP}/initramfs-gpg-temp/sbin/"
 
     print_info 1 "Including GPG support"
-    copy_binaries "${TEMP}/initramfs-gpg-temp" /usr/bin/gpg
+    copy_binaries "${TEMP}/initramfs-gpg-temp" /usr/bin/staticgpg
 
     cd "${TEMP}/initramfs-gpg-temp/"
     log_future_cpio_content