diff --git a/installer/kickstart/enroll-secureboot-key.sh b/installer/kickstart/enroll-secureboot-key.sh
index d3bfb3f..9a31aa4 100755
--- a/installer/kickstart/enroll-secureboot-key.sh
+++ b/installer/kickstart/enroll-secureboot-key.sh
@@ -15,4 +15,4 @@ if [[ ! -f "${SECUREBOOT_KEY}" ]]; then
     exit 1
 fi
 
-echo -e "${ENROLLMENT_PASSWORD}\n${ENROLLMENT_PASSWORD}" | mokutil --import "${SECUREBOOT_KEY}" ||:
+echo -e "${ENROLLMENT_PASSWORD}\n${ENROLLMENT_PASSWORD}" | mokutil --import "${SECUREBOOT_KEY}" --timeout -1 ||:
diff --git a/installer/kickstart/post-install-nvidia.sh b/installer/kickstart/post-install.sh
similarity index 64%
rename from installer/kickstart/post-install-nvidia.sh
rename to installer/kickstart/post-install.sh
index 8411031..45d780a 100755
--- a/installer/kickstart/post-install-nvidia.sh
+++ b/installer/kickstart/post-install.sh
@@ -4,5 +4,4 @@ set -oue pipefail
 
 source /run/install/repo/kickstart/ublue-os-env-vars
 
-/run/install/repo/kickstart/enroll-secureboot-key.sh "${SECUREBOOT_KEY_OLD}" "${ENROLLMENT_PASSWORD}"
 /run/install/repo/kickstart/enroll-secureboot-key.sh "${SECUREBOOT_KEY}" "${ENROLLMENT_PASSWORD}"
diff --git a/installer/kickstart/ublue-os-deck.ks b/installer/kickstart/ublue-os-deck.ks
index 28c306e..b857ee6 100644
--- a/installer/kickstart/ublue-os-deck.ks
+++ b/installer/kickstart/ublue-os-deck.ks
@@ -4,7 +4,8 @@
 
 %include /tmp/ks-urls.txt
 
-bootloader --append="amd_pstate=active amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 initcall_blacklist=simpledrm_platform_driver_init rd.luks.options=discard"
+bootloader --append="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 rd.luks.options=discard"
 
 %post --logfile=/root/ks-post.log --erroronfail --nochroot
+%ksappend /run/install/repo/kickstart/post-install.sh
 %end
diff --git a/installer/kickstart/ublue-os-env-vars b/installer/kickstart/ublue-os-env-vars
index 74ebd05..c72ae9e 100644
--- a/installer/kickstart/ublue-os-env-vars
+++ b/installer/kickstart/ublue-os-env-vars
@@ -1,4 +1,3 @@
-SECUREBOOT_KEY_OLD="/run/install/repo/ublue-os-nvidia-public-key.der"
 SECUREBOOT_KEY="/run/install/repo/ublue-os-akmods-public-key.der"
 # Not a secure password, but needed for scripted key enrollment
 ENROLLMENT_PASSWORD="ublue-os"
diff --git a/installer/kickstart/ublue-os-nvidia.ks b/installer/kickstart/ublue-os-nvidia.ks
index 0fef05a..c261a9b 100644
--- a/installer/kickstart/ublue-os-nvidia.ks
+++ b/installer/kickstart/ublue-os-nvidia.ks
@@ -7,5 +7,5 @@
 bootloader --append="rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1 rd.luks.options=discard"
 
 %post --logfile=/root/ks-post.log --erroronfail --nochroot
-%ksappend /run/install/repo/kickstart/post-install-nvidia.sh
+%ksappend /run/install/repo/kickstart/post-install.sh
 %end
diff --git a/installer/kickstart/ublue-os.ks b/installer/kickstart/ublue-os.ks
index f3b26d7..da2924f 100644
--- a/installer/kickstart/ublue-os.ks
+++ b/installer/kickstart/ublue-os.ks
@@ -6,5 +6,6 @@
 
 bootloader --append="rd.luks.options=discard"
 
-%post --logfile=/root/ks-post.log --erroronfail
+%post --logfile=/root/ks-post.log --erroronfail --nochroot
+%ksappend /run/install/repo/kickstart/post-install.sh
 %end
diff --git a/installer/securebootkeys/ublue-os-nvidia-public-key.der b/installer/securebootkeys/ublue-os-nvidia-public-key.der
deleted file mode 100644
index fc3c038..0000000
Binary files a/installer/securebootkeys/ublue-os-nvidia-public-key.der and /dev/null differ