diff --git a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
index c4258ff..d16ba16 100644
--- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -1,5 +1,5 @@
-title   CachyOS x86_64 UEFI Default
+title   CachyOS %ARCH% UEFI Default
 sort-key A
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img
+linux   /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts
+initrd  /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img
 options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
diff --git a/archiso/efiboot/loader/entries/fallback.conf b/archiso/efiboot/loader/entries/fallback.conf
index 01102a4..d44b69b 100644
--- a/archiso/efiboot/loader/entries/fallback.conf
+++ b/archiso/efiboot/loader/entries/fallback.conf
@@ -1,5 +1,5 @@
-title   CachyOS x86_64 Legacy Hardware Fallback (nomodeset)
+title   CachyOS %ARCH% Legacy Hardware Fallback (nomodeset)
 sort-key  C
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img
+linux   /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts
+initrd  /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img
 options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes
diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg
index 1b89a5d..6bd265f 100644
--- a/archiso/syslinux/archiso_pxe-linux.cfg
+++ b/archiso/syslinux/archiso_pxe-linux.cfg
@@ -3,9 +3,9 @@ TEXT HELP
 Boot the CachyOS install medium using NBD.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
-MENU LABEL CachyOS install medium (x86_64, NBD)
-LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts
-INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img
+MENU LABEL CachyOS install medium (%ARCH%, NBD)
+LINUX ::/%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts
+INITRD ::/%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y
 SYSAPPEND 3
 
@@ -14,9 +14,9 @@ TEXT HELP
 Boot the CachyOS live medium using NFS.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
-MENU LABEL CachyOS install medium (x86_64, NFS)
-LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts
-INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img
+MENU LABEL CachyOS install medium (%ARCH%, NFS)
+LINUX ::/%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts
+INITRD ::/%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y
 SYSAPPEND 3
 
@@ -25,8 +25,8 @@ TEXT HELP
 Boot the CachyOS live medium using HTTP.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
-MENU LABEL CachyOS install medium (x86_64, HTTP)
-LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts
-INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img
+MENU LABEL CachyOS install medium (%ARCH%, HTTP)
+LINUX ::/%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts
+INITRD ::/%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y
 SYSAPPEND 3
diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg
index 8c30d3f..7e7d2f1 100644
--- a/archiso/syslinux/archiso_sys-linux.cfg
+++ b/archiso/syslinux/archiso_sys-linux.cfg
@@ -3,9 +3,9 @@ TEXT HELP
 Boot the CachyOS install medium on BIOS.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
-MENU LABEL CachyOS default (x86_64, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img
+MENU LABEL CachyOS default (%ARCH%, BIOS)
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts
+INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes
 
 # Fallback (nomodeset)
@@ -15,6 +15,6 @@ Boot the CachyOS install medium on Bios in fallback mode
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
 MENU LABEL CachyOS Fallback (nomodeset, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts
+INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nomodeset nvme_load=yes