diff --git a/efiboot/loader/entries/archiso-x86_64-linux-nv.conf b/efiboot/loader/entries/archiso-x86_64-linux-nv.conf
index 7203d6b2..be00d380 100644
--- a/efiboot/loader/entries/archiso-x86_64-linux-nv.conf
+++ b/efiboot/loader/entries/archiso-x86_64-linux-nv.conf
@@ -1,7 +1,7 @@
 title   EndeavourOS x86_64 UEFI NVIDIA (latest cards only)
 sort-key  B
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr
diff --git a/efiboot/loader/entries/archiso-x86_64-linux.conf b/efiboot/loader/entries/archiso-x86_64-linux.conf
index d99f0ac4..04e55f92 100644
--- a/efiboot/loader/entries/archiso-x86_64-linux.conf
+++ b/efiboot/loader/entries/archiso-x86_64-linux.conf
@@ -1,7 +1,7 @@
 title   EndeavourOS x86_64 UEFI Default
 sort-key  A
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes
diff --git a/efiboot/loader/entries/fallback.conf b/efiboot/loader/entries/fallback.conf
index 45b04535..5ebed4d4 100644
--- a/efiboot/loader/entries/fallback.conf
+++ b/efiboot/loader/entries/fallback.conf
@@ -1,5 +1,5 @@
 title   EndeavourOS x86_64 Fallback (nomodeset)
 sort-key  C
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes
diff --git a/packages.x86_64 b/packages.x86_64
index 4c9bdbf0..bbd34f8a 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -14,10 +14,10 @@ dracut
 edk2-shell
 inetutils
 less
-linux
+linux-lts
 linux-firmware
 linux-firmware-marvell
-linux-headers
+linux-lts-headers
 logrotate
 lsb-release
 man-db
diff --git a/run_before_squashfs.sh b/run_before_squashfs.sh
index 0769cf76..acab9600 100755
--- a/run_before_squashfs.sh
+++ b/run_before_squashfs.sh
@@ -62,12 +62,14 @@ echo "------------------" >> "/etc/motd"
 pacman -U --noconfirm -- "/root/packages/"*".pkg.tar.zst"
 rm -rf "/root/packages/"
 
+bootctl update
+
 # Enable systemd services
 # --> now in airootfs/etc/systemd/system/multi-user.target.wants
 #systemctl enable NetworkManager.service systemd-timesyncd.service bluetooth.service firewalld.service
-#systemctl enable vboxservice.service vmtoolsd.service vmware-vmblock-fuse.service
-#systemctl enable intel.service
 systemctl set-default multi-user.target
+#systemctl enable intel.service
+
 
 # Set wallpaper for live-session and original for installed system
 mv "endeavouros-wallpaper.png" "/etc/calamares/files/endeavouros-wallpaper.png"
@@ -86,7 +88,7 @@ mv "/usr/lib/modules-load.d/nvidia-utils.conf" "/etc/calamares/files/nv-modules-
 # Get extra drivers!
 mkdir "/opt/extra-drivers"
 pacman -Syy
-pacman -Sw --noconfirm --cachedir "/opt/extra-drivers" r8168
+pacman -Sw --noconfirm --cachedir "/opt/extra-drivers" r8168-lts
 
 # install packages
 mkdir -p "/usr/share/packages"
diff --git a/syslinux/archiso_sys-linux.cfg b/syslinux/archiso_sys-linux.cfg
index 82306d2d..dca78d87 100644
--- a/syslinux/archiso_sys-linux.cfg
+++ b/syslinux/archiso_sys-linux.cfg
@@ -4,8 +4,8 @@ Boot the EndeavourOS install medium on BIOS.
 It allows you to install EndeavourOS or perform system maintenance.
 ENDTEXT
 MENU LABEL EndeavourOS default (x86_64, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n nouveau.modeset=1 module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes
 
 # Nvidia propritary (Non-Free)
@@ -15,8 +15,8 @@ Boot the EndeavourOS install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS N
 It allows you to install EndeavourOS or perform system maintenance.
 ENDTEXT
 MENU LABEL EndeavourOS NVIDIA (latest cards, x86_64, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes
 
 # Fallback (nomodeset)
@@ -26,6 +26,6 @@ Boot the EndeavourOS install medium on Bios in fallback mode
 It allows you to install EndeavourOS or perform system maintenance.
 ENDTEXT
 MENU LABEL EndeavourOS Fallback (nomodeset, BIOS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
+INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nomodeset nvme_load=yes