diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh
index 40b88b7..d166fd1 100755
--- a/stage0/00-configure-apt/00-run.sh
+++ b/stage0/00-configure-apt/00-run.sh
@@ -34,9 +34,10 @@ fi
 
 # Configure apt preferences
 install -m 644 files/apt-chillcraftos-prefs "${ROOTFS_DIR}/etc/apt/preferences.d/"
+sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/preferences.d/apt-chillcraftos-prefs"
 
+# Add raspberrypi-archive-keyring to apt if armhf or arm64
 if [[ "${ARCH}" == "arm64" || "${ARCH}" == "armhf" ]]; then
-	# Add raspberrypi-archive-keyring to apt
 	install -m 644 files/raspberrypi-archive-keyring.pgp "${ROOTFS_DIR}/usr/share/keyrings/"
 fi
 
diff --git a/stage0/00-configure-apt/files/apt-chillcraftos-prefs b/stage0/00-configure-apt/files/apt-chillcraftos-prefs
index c8fb40a..084082e 100644
--- a/stage0/00-configure-apt/files/apt-chillcraftos-prefs
+++ b/stage0/00-configure-apt/files/apt-chillcraftos-prefs
@@ -1,3 +1,3 @@
 Package: *
-Pin: release o=apt.oxmc.me, n=bookworm
+Pin: release o=apt.oxmc.me, n=RELEASE
 Pin-Priority: 1001
diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh
index 711eb48..56274ea 100755
--- a/stage1/01-sys-tweaks/00-run.sh
+++ b/stage1/01-sys-tweaks/00-run.sh
@@ -4,7 +4,7 @@ install -m 755 files/system-readonly "${ROOTFS_DIR}/sbin/"
 
 if [ "${ARCH}" = "amd64" ]; then
 	install -m 644 files/fstab-amd64 "${ROOTFS_DIR}/etc/fstab"
-elif [ "${ARCH}" = "arm64" ]; then
+if [[ "${ARCH}" == "arm64" || "${ARCH}" == "armhf" ]]; then
 	install -m 644 files/fstab-rpi "${ROOTFS_DIR}/etc/fstab"
 fi
 
diff --git a/stage2/01-sys-tweaks/00-patches-amd64/02-inputrc.diff b/stage2/01-sys-tweaks/00-patches-amd64/02-inputrc.diff
new file mode 100644
index 0000000..4091aec
--- /dev/null
+++ b/stage2/01-sys-tweaks/00-patches-amd64/02-inputrc.diff
@@ -0,0 +1,10 @@
+--- stage2.orig/rootfs/etc/inputrc
++++ stage2/rootfs/etc/inputrc
+@@ -59,3 +59,7 @@
+ # "\e[F": end-of-line
+
+ $endif
++
++# mappings for up and down arrows search history
++# "\e[B": history-search-forward
++# "\e[A": history-search-backward
diff --git a/stage2/01-sys-tweaks/00-patches-amd64/series b/stage2/01-sys-tweaks/00-patches-amd64/series
new file mode 100644
index 0000000..5f9cf2e
--- /dev/null
+++ b/stage2/01-sys-tweaks/00-patches-amd64/series
@@ -0,0 +1 @@
+02-inputrc.diff
diff --git a/stage2/01-sys-tweaks/00-patches/02-inputrc.diff b/stage2/01-sys-tweaks/00-patches-arm-only/02-inputrc.diff
similarity index 100%
rename from stage2/01-sys-tweaks/00-patches/02-inputrc.diff
rename to stage2/01-sys-tweaks/00-patches-arm-only/02-inputrc.diff
diff --git a/stage2/01-sys-tweaks/00-patches/series b/stage2/01-sys-tweaks/00-patches/series
index 89b886d..ce98731 100644
--- a/stage2/01-sys-tweaks/00-patches/series
+++ b/stage2/01-sys-tweaks/00-patches/series
@@ -1,3 +1,2 @@
 01-useradd.diff
-02-inputrc.diff
 03-path.diff
diff --git a/stage2/01-sys-tweaks/01-packages-arm-only b/stage2/01-sys-tweaks/01-packages-arm-only
index f8e5eb8..bd38ebb 100644
--- a/stage2/01-sys-tweaks/01-packages-arm-only
+++ b/stage2/01-sys-tweaks/01-packages-arm-only
@@ -9,4 +9,4 @@ python3-rpi-lgpio
 rpi-keyboard-config
 rpi-keyboard-fw-update
 rpi-usb-gadget
-kms++-utils
\ No newline at end of file
+kms++-utils