diff --git a/Dockerfile b/Dockerfile
index b6a3397..ff2a1a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,6 +55,9 @@ RUN dnf install -y ${KERNEL}-devel ${KERNEL}-devel-matched
 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})
 
+# Install Nvidia X11 driver
+RUN dnf install xorg-x11-nvidia --enablerepo=fc-nvidia -y
+
 RUN dnf install -y waydroid scx-scheds
 
 # Remove plocate to avoid updatedb going crazy with scanning the file system once a day
@@ -88,7 +91,7 @@ RUN dnf install firefox thunderbird -y
 RUN rm -f /usr/lib64/libopenh264.so.2.4.1 /usr/lib64/libopenh264.so.7
 RUN rpm -Uvh --nodeps https://codecs.fedoraproject.org/openh264/42/x86_64/Packages/o/openh264-2.5.1-1.fc42.x86_64.rpm https://codecs.fedoraproject.org/openh264/42/x86_64/Packages/m/mozilla-openh264-2.5.1-1.fc42.x86_64.rpm
 
-RUN dnf install xorg-x11-xinit xkbcomp xinput xlibre-xserver-Xorg xlibre-xf86-input-libinput cage weston redshift -y
+RUN dnf install xorg-x11-xinit xkbcomp xinput xlibre-xserver-Xorg xlibre-xf86-input-libinput cage weston redshift xrandr -y
 
 RUN dnf install ananicy-cpp cachyos-ananicy-rules cachyos-settings -y \
     && systemctl enable ananicy-cpp
diff --git a/etc/X11/xorg.conf.d/20-modesetting.conf b/etc/X11/xorg.conf.d/20-modesetting.conf
deleted file mode 100644
index ce0c1d9..0000000
--- a/etc/X11/xorg.conf.d/20-modesetting.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-Section "Device"
-    Identifier    "Intel Graphics"
-    Driver        "modesetting"
-    Option        "ShadowFB" "false" # you don't need on recent hardware
-    Option        "Atomic" "true" #only effective on Xlibre, or Xorg-git with a special patch
-    Option        "TearFree" "false" # Compositor is being used so TearFree is not needed
-EndSection
diff --git a/etc/X11/xorg.conf.d/20-nvidia.conf b/etc/X11/xorg.conf.d/20-nvidia.conf
new file mode 100644
index 0000000..105cacd
--- /dev/null
+++ b/etc/X11/xorg.conf.d/20-nvidia.conf
@@ -0,0 +1,31 @@
+Section "ServerLayout"
+    Identifier "layout"
+    Screen 0 "intel"
+    Inactive "nvidia"
+    Option "AllowNVIDIAGPUScreens"
+EndSection
+
+Section "Device"
+    Identifier "nvidia"
+    Driver "nvidia"
+    BusID "PCI:1:0:0"
+EndSection
+
+Section "Screen"
+    Identifier "nvidia"
+    Device "nvidia"
+EndSection
+
+Section "Device"
+    Identifier "intel"
+    Driver "modesetting"
+    BusID "PCI:0:2:0"
+    Option        "ShadowFB" "false" # you don't need on recent hardware
+    Option        "Atomic" "true" #only effective on Xlibre, or Xorg-git with a special patch
+    Option        "TearFree" "false" # Compositor is being used so TearFree is not needed
+EndSection
+
+Section "Screen"
+    Identifier "intel"
+    Device "intel"
+EndSection
diff --git a/repo/fc-nvidia.repo b/repo/fc-nvidia.repo
new file mode 100644
index 0000000..6757da0
--- /dev/null
+++ b/repo/fc-nvidia.repo
@@ -0,0 +1,35 @@
+[fc-nvidia]
+name=negativo17 - Nvidia
+baseurl=https://negativo17.org/repos/nvidia/fedora-44/$basearch/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
+enabled_metadata=1
+metadata_expire=6h
+type=rpm-md
+repo_gpgcheck=0
+
+[fc-nvidia-source]
+name=negativo17 - Nvidia - Source
+baseurl=https://negativo17.org/repos/nvidia/fedora-44/SRPMS
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
+enabled_metadata=1
+metadata_expire=6h
+type=rpm-md
+repo_gpgcheck=0
+
+[fc-nvidia-debug]
+name=negativo17 - Nvidia - Debug
+baseurl=https://negativo17.org/repos/nvidia/fedora-44/$basearch.debug/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
+enabled_metadata=1
+metadata_expire=6h
+type=rpm-md
+repo_gpgcheck=0