diff --git a/packages/kmod-6.1-nvidia-r570/kmod-6.1-nvidia-r570.spec b/packages/kmod-6.1-nvidia-r570/kmod-6.1-nvidia-r570.spec
index 08365a78..9418eae4 100644
--- a/packages/kmod-6.1-nvidia-r570/kmod-6.1-nvidia-r570.spec
+++ b/packages/kmod-6.1-nvidia-r570/kmod-6.1-nvidia-r570.spec
@@ -79,6 +79,7 @@ Requires: %{name}-open-gpu
 %if "%{_cross_arch}" == "x86_64"
 Requires: %{name}-grid
 %endif
+Requires: %{name}-mps
 
 %description
 %{summary}.
@@ -126,6 +127,13 @@ Provides: %{name}-tesla(fabricmanager)
 %description tesla
 %{summary}
 
+%package mps
+Summary: NVIDIA CUDA Multi-Process Service
+Requires: %{name}
+
+%description mps
+%{summary}.
+
 %prep
 # Extract nvidia sources with `-x`, otherwise the script will try to install
 # the driver in the current run
@@ -666,10 +674,7 @@ popd
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-peermem.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.mod.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.o
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server
-%exclude %{_cross_bindir}/nvidia-cuda-mps-control
-%exclude %{_cross_bindir}/nvidia-cuda-mps-server
+
 %if "%{_cross_arch}" == "x86_64"
 %exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-ngx-updater
 %exclude %{_cross_bindir}/nvidia-ngx-updater
@@ -734,3 +739,9 @@ popd
 %{_cross_factorydir}%{_cross_sysconfdir}/nvidia/fabricmanager.cfg
 %{_cross_factorydir}%{_cross_sysconfdir}/nvidia/fabricmanager.env
 %{_cross_unitdir}/nvidia-fabricmanager.service
+
+%files mps
+%{_cross_bindir}/nvidia-cuda-mps-control
+%{_cross_bindir}/nvidia-cuda-mps-server
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server
diff --git a/packages/kmod-6.1-nvidia-r580/kmod-6.1-nvidia-r580.spec b/packages/kmod-6.1-nvidia-r580/kmod-6.1-nvidia-r580.spec
index 6c04bb43..70892102 100644
--- a/packages/kmod-6.1-nvidia-r580/kmod-6.1-nvidia-r580.spec
+++ b/packages/kmod-6.1-nvidia-r580/kmod-6.1-nvidia-r580.spec
@@ -79,6 +79,7 @@ Requires: %{name}-open-gpu
 %if "%{_cross_arch}" == "x86_64"
 Requires: %{name}-grid
 %endif
+Requires: %{name}-mps
 
 %description
 %{summary}.
@@ -126,6 +127,13 @@ Provides: %{name}-tesla(fabricmanager)
 %description tesla
 %{summary}
 
+%package mps
+Summary: NVIDIA CUDA Multi-Process Service
+Requires: %{name}
+
+%description mps
+%{summary}.
+
 %prep
 # Extract nvidia sources with `-x`, otherwise the script will try to install
 # the driver in the current run
@@ -674,10 +682,7 @@ popd
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-peermem.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.mod.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.o
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server
-%exclude %{_cross_bindir}/nvidia-cuda-mps-control
-%exclude %{_cross_bindir}/nvidia-cuda-mps-server
+
 %if "%{_cross_arch}" == "x86_64"
 %exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-ngx-updater
 %exclude %{_cross_bindir}/nvidia-ngx-updater
@@ -742,3 +747,9 @@ popd
 %{_cross_factorydir}%{_cross_sysconfdir}/nvidia/fabricmanager.cfg
 %{_cross_factorydir}%{_cross_sysconfdir}/nvidia/fabricmanager.env
 %{_cross_unitdir}/nvidia-fabricmanager.service
+
+%files mps
+%{_cross_bindir}/nvidia-cuda-mps-control
+%{_cross_bindir}/nvidia-cuda-mps-server
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server
diff --git a/packages/kmod-6.12-nvidia-r570/kmod-6.12-nvidia-r570.spec b/packages/kmod-6.12-nvidia-r570/kmod-6.12-nvidia-r570.spec
index ff563e2f..15801701 100644
--- a/packages/kmod-6.12-nvidia-r570/kmod-6.12-nvidia-r570.spec
+++ b/packages/kmod-6.12-nvidia-r570/kmod-6.12-nvidia-r570.spec
@@ -86,6 +86,7 @@ Requires: %{name}-open-gpu
 %if "%{_cross_arch}" == "x86_64"
 Requires: %{name}-grid
 %endif
+Requires: %{name}-mps
 
 %description
 %{summary}.
@@ -141,6 +142,13 @@ Provides: %{name}-tesla(fabricmanager)
 %description tesla
 %{summary}
 
+%package mps
+Summary: NVIDIA CUDA Multi-Process Service
+Requires: %{name}
+
+%description mps
+%{summary}.
+
 %prep
 # Extract nvidia sources with `-x`, otherwise the script will try to install
 # the driver in the current run
@@ -692,10 +700,7 @@ popd
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-peermem.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.mod.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.o
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server
-%exclude %{_cross_bindir}/nvidia-cuda-mps-control
-%exclude %{_cross_bindir}/nvidia-cuda-mps-server
+
 %if "%{_cross_arch}" == "x86_64"
 %exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-ngx-updater
 %exclude %{_cross_bindir}/nvidia-ngx-updater
@@ -756,6 +761,12 @@ popd
 %{_cross_datadir}/nvidia/grid/drivers/nvidia-peermem.ko
 %endif
 
+%files mps
+%{_cross_bindir}/nvidia-cuda-mps-control
+%{_cross_bindir}/nvidia-cuda-mps-server
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server
+
 %files fabricmanager
 %{_cross_factorydir}%{_cross_sysconfdir}/nvidia/fabricmanager.cfg
 %{_cross_factorydir}%{_cross_sysconfdir}/nvidia/fabricmanager.env
diff --git a/packages/kmod-6.12-nvidia-r580/kmod-6.12-nvidia-r580.spec b/packages/kmod-6.12-nvidia-r580/kmod-6.12-nvidia-r580.spec
index d9a7806c..7a56c610 100644
--- a/packages/kmod-6.12-nvidia-r580/kmod-6.12-nvidia-r580.spec
+++ b/packages/kmod-6.12-nvidia-r580/kmod-6.12-nvidia-r580.spec
@@ -86,6 +86,7 @@ Requires: %{name}-open-gpu
 %if "%{_cross_arch}" == "x86_64"
 Requires: %{name}-grid
 %endif
+Requires: %{name}-mps
 
 %description
 %{summary}.
@@ -141,6 +142,13 @@ Provides: %{name}-tesla(fabricmanager)
 %description tesla
 %{summary}
 
+%package mps
+Summary: NVIDIA CUDA Multi-Process Service
+Requires: %{name}
+
+%description mps
+%{summary}.
+
 %prep
 # Extract nvidia sources with `-x`, otherwise the script will try to install
 # the driver in the current run
@@ -698,10 +706,6 @@ popd
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-peermem.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.mod.o
 %exclude %{_cross_datadir}/nvidia/tesla/module-objects.d/nvidia-drm.o
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
-%exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server
-%exclude %{_cross_bindir}/nvidia-cuda-mps-control
-%exclude %{_cross_bindir}/nvidia-cuda-mps-server
 %if "%{_cross_arch}" == "x86_64"
 %exclude %{_cross_libexecdir}/nvidia/tesla/bin/nvidia-ngx-updater
 %exclude %{_cross_bindir}/nvidia-ngx-updater
@@ -770,3 +774,9 @@ popd
 %files imex
 %{_cross_bindir}/nvidia-imex
 %{_cross_bindir}/nvidia-imex-ctl
+
+%files mps
+%{_cross_bindir}/nvidia-cuda-mps-control
+%{_cross_bindir}/nvidia-cuda-mps-server
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-control
+%{_cross_libexecdir}/nvidia/tesla/bin/nvidia-cuda-mps-server