diff --git a/home/.EFISTUB/4-ck.efi b/home/.EFISTUB/01-ck.efi
similarity index 81%
rename from home/.EFISTUB/4-ck.efi
rename to home/.EFISTUB/01-ck.efi
index 0535d70..3bc973f 100755
--- a/home/.EFISTUB/4-ck.efi
+++ b/home/.EFISTUB/01-ck.efi
@@ -9,4 +9,4 @@ sudo efibootmgr \
 	--remove-dups \
 	--label "Arch Linux (ck-zen)" \
 	--loader /vmlinuz-linux-ck-zen \
-	--unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=0 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux-ck-zen.img'
+	--unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=0 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux-ck-zen.img amdgpu.noretry=0 amdgpu.noretry=0'
diff --git a/home/.EFISTUB/1-arch.efi b/home/.EFISTUB/02-arch.efi
similarity index 85%
rename from home/.EFISTUB/1-arch.efi
rename to home/.EFISTUB/02-arch.efi
index 36acada..3e6191e 100755
--- a/home/.EFISTUB/1-arch.efi
+++ b/home/.EFISTUB/02-arch.efi
@@ -9,4 +9,4 @@ sudo efibootmgr \
 	--remove-dups \
 	--label "Arch Linux" \
 	--loader /vmlinuz-linux \
-	--unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=0 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img'
+	--unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=0 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0'
diff --git a/home/.EFISTUB/2-lts.efi b/home/.EFISTUB/03-lts.efi
similarity index 84%
rename from home/.EFISTUB/2-lts.efi
rename to home/.EFISTUB/03-lts.efi
index 095792b..f4c2bef 100755
--- a/home/.EFISTUB/2-lts.efi
+++ b/home/.EFISTUB/03-lts.efi
@@ -9,4 +9,4 @@ sudo efibootmgr \
 	--remove-dups \
 	--label "Arch Linux LTS" \
 	--loader /vmlinuz-linux-lts \
-	--unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=0 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux-lts.img'
+	--unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=0 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux-lts.img amdgpu.noretry=0'
diff --git a/home/.EFISTUB/3-zen.efi b/home/.EFISTUB/3-zen.efi
deleted file mode 100755
index 6acf079..0000000
--- a/home/.EFISTUB/3-zen.efi
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# vim:ft=sh
-
-sudo efibootmgr \
-	--disk /dev/sda \
-	--part 1 \
-	--create \
-	--quiet \
-	--remove-dups \
-	--label "Arch Linux ZEN" \
-	--loader /vmlinuz-linux-zen \
-	--unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=0 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux-zen.img'
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index 6fa0282..f572251 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -8,7 +8,6 @@ SigLevel = Required DatabaseOptional
 Architecture = auto
 LocalFileSigLevel = Optional
 CacheDir = /var/cache/pacman/pkg
-IgnorePkg = linux linux-headers
 
 [core]
 Include = /etc/pacman.d/pacserve