diff --git a/Dockerfile b/Dockerfile
index 7ae3077..a5b7856 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,15 @@
 FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 
-ARG KERNEL=kernel
+ARG KERNEL=kernel-cachyos
 ENV KERNEL=${KERNEL}
 
-RUN dnf upgrade -y
-
 RUN echo 'omit_drivers+=" nouveau "' | tee /etc/dracut.conf.d/blacklist-nouveau.conf
 
 COPY bin/set_next_version.sh /tmp
 RUN /tmp/set_next_version.sh
 
 COPY repo/*.repo /etc/yum.repos.d/
+RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo -y
 
 RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
 
@@ -40,29 +39,25 @@ RUN dnf remove -y sddm && \
 RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop
 RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v3.0.0-beta-3/appimagelauncher_3.0.0-beta-2-gha287.96cb937_x86_64.rpm
 
+# Enable CachyOS repositories
+RUN dnf copr enable bieszczaders/kernel-cachyos -y
+
 # Enable CachyOS addons EL10 fork repo
 RUN dnf copr enable andersrh/kernel-cachyos-addons-el10 -y
 
-RUN dnf install -y ${KERNEL}-devel ${KERNEL}-headers
+RUN dnf install -y ${KERNEL} ${KERNEL}-devel-matched
+
+RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-tools kernel-tools-libs
 
 RUN wget https://download.virtualbox.org/virtualbox/rpm/el/virtualbox.repo -O /etc/yum.repos.d/virtualbox.repo
-RUN dnf install -y chkconfig
 
-RUN dnf install VirtualBox-7.2 -y && \
-    KVER=$(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL}) && \
-    for mod in vboxdrv vboxnetflt vboxnetadp; do \
-        make -C /lib/modules/${KVER}/build M=/usr/share/virtualbox/src/vboxhost/${mod} \
-            KERN_VER=${KVER} CONFIG_MODULE_COMPRESS_GZIP= CONFIG_MODULE_COMPRESS_XZ= \
-            CONFIG_MODULE_COMPRESS_ZSTD= -j$(nproc) modules; \
-        make -C /lib/modules/${KVER}/build M=/usr/share/virtualbox/src/vboxhost/${mod} \
-            KERN_VER=${KVER} INSTALL_MOD_DIR=misc modules_install; \
-    done && \
-    depmod ${KVER}
-    
-RUN systemctl enable vboxdrv
+RUN dnf install VirtualBox-7.2 -y
+RUN /sbin/vboxconfig
 
-RUN dnf install almalinux-release-nvidia-driver -y
-RUN dnf install nvidia-open-kmod nvidia-driver nvidia-driver-cuda -y
+# Install Negativo17 Nvidia driver
+RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
+
+RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
 
 RUN dnf install -y waydroid scx-scheds