diff --git a/mkosi.conf.d/00-packages-core.conf b/mkosi.conf.d/00-packages-core.conf
index 765d685..52c7587 100644
--- a/mkosi.conf.d/00-packages-core.conf
+++ b/mkosi.conf.d/00-packages-core.conf
@@ -10,10 +10,10 @@ Packages=archlinux-keyring
          glibc-locales # instead of running locale-gen as part of our build we install a package that has all locales pre-generated
          kernel-modules-hook
          kmod
-         linux
          linux-atm
+         linux-zen # Improved Kernel
+         linux-zen-headers # For DKMS
          linux-firmware
-         linux-headers # For DKMS
          mkinitcpio
          mkinitcpio-systemd-tool
          noto-fonts
diff --git a/mkosi.conf.d/20-packages-graphics.conf b/mkosi.conf.d/20-packages-graphics.conf
index 3e0a7ed..cf2bba6 100644
--- a/mkosi.conf.d/20-packages-graphics.conf
+++ b/mkosi.conf.d/20-packages-graphics.conf
@@ -8,7 +8,7 @@ Packages=mesa
          libva-mesa-driver # Hardware accelerated video on AMD GPUs
          libva-nvidia-driver # Hardware accelerated video on NVIDIA GPUs
          libva # Hardware accelerated video in general
-         nvidia-open
+         nvidia-open-dkms # For all Linux Kernels
          vpl-gpu-rt # Hardware accelerated video on newer Intel GPUs
          vulkan-icd-loader
          vulkan-intel