diff --git a/admin-guide/puppet/profiles/nvidia.rst b/admin-guide/puppet/profiles/nvidia.rst
index 0a2abce2..f6b19874 100644
--- a/admin-guide/puppet/profiles/nvidia.rst
+++ b/admin-guide/puppet/profiles/nvidia.rst
@@ -9,32 +9,29 @@ class will be called. The ``class profile::platform`` is responsible for calling
     class { 'profile::nvidia':; }
   }
 
-Current profile only installs drivers using the CUDA installation. Other NVIDIA installations 
-(i.e. just NVIDIA drivers for Desktops without CUDA) are still not implemented.
+By default the profile only installs the GPU drivers, which can be disabled setting ``nvidia::driver::enable`` to ``false``.
 
 To enable CUDA installation ``nvidia::cuda::enable`` must be set to ``true`` (default
-is ``false``). When this setting is set to ``false`` (default), NVIDIA installation without
-CUDA should be performed (as already specified, this is not implemented yet)
+is ``false``).
 
 Parameters
 ----------
 
-=================  ==========  ===========
-**Name**           **Type**    **Default**
------------------  ----------  -----------
-cuda_version       string      8-0
-cuda_enable        bool        false
-=================  ==========  ===========
+=============  ========  =======================================================
+**Name**       **Type**  **Default**
+-------------  --------  -------------------------------------------------------
+dgx            boolean   $::productname ? { /^DGX.*/ => true, default => false }
+driver_enable  boolean   hiera('nvidia::driver::enable', true)
+cuda_enable    boolean   hiera('nvidia::cuda::enable', true)
+=============  ========  =======================================================
 
 
-``cuda_version``
+``driver_enable``
 ~~~~~~~~~~~~~~~~
 
-By default ``8-0`` is the version for the CUDA metapackage. To make installation possible,
-``cuda_enable`` must be also set up.
+Install the Nvidia GPU drivers. By default is ``true``.
 
 ``cuda_enable``
 ~~~~~~~~~~~~~~~
 
-By default is ``false``. Set to ``true`` if you want to install CUDA and NVIDIA drivers from
-the CUDA repositories.
+By default is ``false``. Set to ``true`` if you want to install CUDA.
diff --git a/rhel8/nvidia.md b/rhel8/nvidia.md
index 300b8cd8..252521c6 100644
--- a/rhel8/nvidia.md
+++ b/rhel8/nvidia.md
@@ -11,9 +11,9 @@ Alternatively you might execute `/opt/pli/libexec/ensure-nvidia-software` in a s
 
 ### I need CUDA
 
-Set in Hiera `nvidia::cuda::install_software: true` and it will automatically install the suitable Nvidia drivers and newest possible CUDA version.
+Set in Hiera `nvidia::cuda::enable true` and it will automatically install the suitable Nvidia drivers and newest possible CUDA version.
 
-To enable `nvidia_persistenced` you additionally need to set `nvidia::cuda::nvidia_persistenced::enable: true`.
+The `nvidia_persistenced` service is automatically started. If you do not want it, to set `nvidia::cuda::nvidia_persistenced::enable: false`.
 
 ### I need a specific CUDA version