diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
index f1f0557309f4e69160bcac47c44921b0f323a853..e12b9ee8063c1ee17a49f6c7d56ced2810c28280 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-CUDA.eb
@@ -20,6 +20,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_HARD_ABORT': '1',
+    'SLURM_MPI_TYPE': 'pspmi',
 }
 
 modluafooter = '''
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
index 3f0f135e759d20f791754b5a4bbbeb136772a12d..48820298007581f16001279b01082ce936398fd3 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5-UCX.eb
@@ -16,6 +16,7 @@ modextravars = {
     'PSP_OPENIB': '0',
     'PSP_UCP': '1',
     'PSP_HARD_ABORT': '1',
+    'SLURM_MPI_TYPE': 'pspmi',
 }
 
 moduleclass = 'system'
diff --git a/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb b/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb
index 45793958bf1aefc5aa52e02f5b6b6847dc65c28d..c6c7234dc0a1bfe4ae06aca319745e4a9b9abe02 100644
--- a/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb
+++ b/Overlays/juwels_overlay/i/impi-settings/impi-settings-2021-UCX.eb
@@ -16,6 +16,7 @@ sources = []
 modextravars = {
     'FI_PROVIDER': 'mlx',
     'I_MPI_PMI_VALUE_LENGTH_MAX': '900',
+    'SLURM_MPI_TYPE': 'pspmi',
 }
 
 moduleclass = 'system'
diff --git a/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb b/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb
index 2900da59e4083c0d7fe1a0d7fd1cae2fd1bd0bf2..cdf59cd272ed79f1cc2c5feade7176aaa149e5f2 100644
--- a/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb
+++ b/Overlays/juwels_overlay/n/nvidia-driver/nvidia-driver-default.eb
@@ -1,6 +1,6 @@
 name = 'nvidia-driver'
 version = 'default'
-realversion = '525.105.17'
+realversion = '535.54.03'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = f"""
@@ -15,7 +15,7 @@ toolchain = SYSTEM
 
 source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
 sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
-checksums = ['c635a21a282c9b53485f19ebb64a0f4b536a968b94d4d97629e0bc547a58142a']
+checksums = ['454764f57ea1b9e19166a370f78be10e71f0626438fb197f726dc3caf05b4082']
 
 # To avoid conflicts between NVML and the kernel driver
 postinstallcmds = ['rm %(installdir)s/lib64/libnvidia-ml.so*']
diff --git a/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb b/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
index 2900da59e4083c0d7fe1a0d7fd1cae2fd1bd0bf2..cdf59cd272ed79f1cc2c5feade7176aaa149e5f2 100644
--- a/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
+++ b/Overlays/juwelsbooster_overlay/n/nvidia-driver/nvidia-driver-default.eb
@@ -1,6 +1,6 @@
 name = 'nvidia-driver'
 version = 'default'
-realversion = '525.105.17'
+realversion = '535.54.03'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = f"""
@@ -15,7 +15,7 @@ toolchain = SYSTEM
 
 source_urls = ['http://us.download.nvidia.com/tesla/%s/' % realversion]
 sources = ['NVIDIA-Linux-x86_64-%s.run' % realversion]
-checksums = ['c635a21a282c9b53485f19ebb64a0f4b536a968b94d4d97629e0bc547a58142a']
+checksums = ['454764f57ea1b9e19166a370f78be10e71f0626438fb197f726dc3caf05b4082']
 
 # To avoid conflicts between NVML and the kernel driver
 postinstallcmds = ['rm %(installdir)s/lib64/libnvidia-ml.so*']