diff --git a/Dockerfile b/Dockerfile
index 039f274..7ae3077 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,14 @@ FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 ARG KERNEL=kernel
 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
 
@@ -39,13 +40,10 @@ 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
+RUN dnf install -y ${KERNEL}-devel ${KERNEL}-headers
 
 RUN wget https://download.virtualbox.org/virtualbox/rpm/el/virtualbox.repo -O /etc/yum.repos.d/virtualbox.repo
 RUN dnf install -y chkconfig
@@ -63,12 +61,8 @@ RUN dnf install VirtualBox-7.2 -y && \
     
 RUN systemctl enable vboxdrv
 
-# Install Negativo17 Nvidia driver
-RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
-
-RUN rpm -e --nodeps kernel-cachyos-server-core kernel-cachyos-server-devel kernel-cachyos-server-devel-matched kernel-cachyos-server-modules
-
-RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
+RUN dnf install almalinux-release-nvidia-driver -y
+RUN dnf install nvidia-open-kmod nvidia-driver nvidia-driver-cuda -y
 
 RUN dnf install -y waydroid scx-scheds