diff --git a/Dockerfile b/Dockerfile
index 08764ce..2a89d10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,14 @@
 FROM quay.io/almalinuxorg/atomic-desktop-kde:10
 
-ARG KERNEL=kernel-cachyos
+ARG KERNEL=kernel
 ENV KERNEL=${KERNEL}
 
-RUN echo 'omit_drivers+=" nouveau "' | tee /etc/dracut.conf.d/blacklist-nouveau.conf
+RUN dnf upgrade -y
 
 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,20 +38,13 @@ 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} ${KERNEL}-devel-matched
+RUN dnf install -y ${KERNEL}-devel ${KERNEL}-headers
 
-RUN dnf remove -y kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-tools kernel-tools-libs
-
-# 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 almalinux-release-nvidia-driver -y
+RUN dnf install nvidia-open-kmod nvidia-driver nvidia-driver-cuda -y
 
 RUN dnf install -y waydroid scx-scheds
 
@@ -107,6 +99,7 @@ RUN systemctl enable docker
 RUN systemctl enable scx_loader
 
 RUN echo 'kargs = ["mem_sleep_default=deep"]' > /usr/lib/bootc/kargs.d/10-mem-sleep.toml
+RUN echo 'kargs = ["rd.driver.blacklist=nouveau", "nouveau.modeset=0"]' > /usr/lib/bootc/kargs.d/20-blacklist-nouveau.toml
 RUN printf '[connection]\nwifi.powersave=2\n' > /usr/lib/NetworkManager/conf.d/disable-wifi-powersave.conf
 
 COPY etc /etc