diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
index fe249b456afbf66b13cd4db0527c55b4bdc08202..0e7bbd0c910d76b91bd4be86146e1af73d533b00 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
@@ -31,6 +31,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'y',
 }
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
index 4a10705c3588cdc68653c584cf7ec92f5a00fd89..7ea994d41e0c1673623658970add8d400af09e1e 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
@@ -18,6 +18,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'n',
 }
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-UCX-plain.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-UCX-plain.eb
index 6ce4d0b158d6b2d7efe3540e8857d853d3aca1ab..f60132e1fa8855e8aad49f981013b664791f9ce7 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-UCX-plain.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-UCX-plain.eb
@@ -17,6 +17,7 @@ sources = []
 modextravars = {
     'PSP_OPENIB': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
 }
 
 moduleclass = 'system'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
index fc428a3039e09e952b2674fac3e5e518bc1298ba..bb11864402e5492fba08fd2660ff7a30d7b40fc5 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
@@ -31,6 +31,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'y',
 }
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
index dba5738bf9fdf1deae95656aebeb6faa2afde2be..879c26739d02b151d0d434045bde928d852e4981 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
@@ -18,6 +18,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'n',
 }
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-plain.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-plain.eb
index 5d04d2f5ed332e1ea1f1f98d1744bd3c142de038..ba74304a955e515bdc7707eef7bc005f3514308a 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-plain.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-plain.eb
@@ -17,6 +17,7 @@ sources = []
 modextravars = {
     'PSP_OPENIB': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
 }
 
 moduleclass = 'system'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb
index 9e7e165df457913d54a38bea2b107dc9745554c8..f6bc981a3d5c0a014f8175fae51ccbb898a63af9 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb
@@ -14,5 +14,8 @@ toolchain = SYSTEM
 source_urls = []
 
 sources = []
+modextravars = {
+    'PSP_HARD_ABORT': '1',
+}
 
 moduleclass = 'system'
diff --git a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-plain.eb b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-plain.eb
index bdb810c78bf5eb0686ec5737d3d96a07d225f8c3..6e5f31e734db6b0e5d80047b01eb45c6a2886f88 100644
--- a/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-plain.eb
+++ b/Golden_Repo/p/psmpi-settings/psmpi-settings-5.4-plain.eb
@@ -14,5 +14,8 @@ toolchain = SYSTEM
 source_urls = []
 
 sources = []
+modextravars = {
+    'PSP_HARD_ABORT': '1',
+}
 
 moduleclass = 'system'
diff --git a/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb b/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb
index b7bedd59956d0801e1cdc5d3821ea49bfa052bd5..8ee1cafa0c1c08b8f626cae99753f4de2b1c4521 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-plain.eb
@@ -17,6 +17,7 @@ sources = []
 
 modextravars = {
     'PSP_READAHEAD': '4096',
+    'PSP_HARD_ABORT': '1',
     'HFI_NO_CPUAFFINITY': '1',
 }
 
diff --git a/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb b/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
index 98b3a08e25b891f5d4525b0f662c75b0631ea372..c364c484685775bb80f6e4de7fe0f9c942edcf2c 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
@@ -17,6 +17,7 @@ sources = []
 
 modextravars = {
     'PSP_READAHEAD': '4096',
+    'PSP_HARD_ABORT': '1',
     'HFI_NO_CPUAFFINITY': '1',
 }
 
diff --git a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
index 0bfc29b0b156115272f05d6ec8872158b5a71ba5..4c0c2ddc4ebb07193099d57e3daf2e0f56a49a93 100644
--- a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
+++ b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
@@ -31,6 +31,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'y',
     'UCX_MAX_RNDV_RAILS': '1',
diff --git a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
index 4c2462d24081a67442489677ac0b1053f9203276..77094b63703cd8f1d4b5d490ae82cc99f5ab3d9e 100644
--- a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
+++ b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
@@ -18,6 +18,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'n',
     'UCX_MAX_RNDV_RAILS': '1',
diff --git a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
index 7e249ae8ec8bf120896d3b15207b4ae1112ae13f..af53fdc9cd8e1bb789a315e13a27e0581e0fa18f 100644
--- a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
+++ b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
@@ -31,6 +31,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'y',
     'UCX_MAX_RNDV_RAILS': '1',
diff --git a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
index 05015464a9bd8a51bfaed045c0016fc2c1766ae6..c5b260f0bd9608cebaea54a357eccb38622b8b28 100644
--- a/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
+++ b/Overlays/jurecadc_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
@@ -18,6 +18,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'n',
     'UCX_MAX_RNDV_RAILS': '1',
diff --git a/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb b/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
index 3622c587cc5c0af6f7f61034801f61bb286804dc..b35b112ac7c1b6f265a71b3e54acc6a57febcd77 100644
--- a/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
+++ b/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
@@ -31,6 +31,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'y',
     'UCX_NET_DEVICES': 'mlx5_1:1',
diff --git a/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb b/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
index de15dc6dbdad4d262a44b721e3254cc67fe9e7a4..da1f9a94bf2b07278003e1cd1ed6b3de5abdbeca 100644
--- a/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
+++ b/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
@@ -18,6 +18,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'n',
     'UCX_NET_DEVICES': 'mlx5_1:1',
diff --git a/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb b/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
index 521259762827f3694e7d0b892f6b5fcf2923540e..a37f3ef07cdf052d78734ca6795ff6110973e393 100644
--- a/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
+++ b/Overlays/jusuf_overlay/p/psmpi-settings/psmpi-settings-5.4-plain.eb
@@ -15,6 +15,7 @@ source_urls = []
 
 sources = []
 modextravars = {
+    'PSP_HARD_ABORT': '1',
     'UCX_NET_DEVICES': 'mlx5_1:1',
 }
 
diff --git a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
index 0bfc29b0b156115272f05d6ec8872158b5a71ba5..4c0c2ddc4ebb07193099d57e3daf2e0f56a49a93 100644
--- a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
+++ b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA-low-latency.eb
@@ -31,6 +31,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'y',
     'UCX_MAX_RNDV_RAILS': '1',
diff --git a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
index 4c2462d24081a67442489677ac0b1053f9203276..77094b63703cd8f1d4b5d490ae82cc99f5ab3d9e 100644
--- a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
+++ b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-CUDA.eb
@@ -18,6 +18,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'n',
     'UCX_MAX_RNDV_RAILS': '1',
diff --git a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
index 7e249ae8ec8bf120896d3b15207b4ae1112ae13f..af53fdc9cd8e1bb789a315e13a27e0581e0fa18f 100644
--- a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
+++ b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA-low-latency.eb
@@ -31,6 +31,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'y',
     'UCX_MAX_RNDV_RAILS': '1',
diff --git a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
index 05015464a9bd8a51bfaed045c0016fc2c1766ae6..c5b260f0bd9608cebaea54a357eccb38622b8b28 100644
--- a/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
+++ b/Overlays/juwelsbooster_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-CUDA.eb
@@ -18,6 +18,7 @@ modextravars = {
     'PSP_CUDA': '1',
     'PSP_SHM': '0',
     'PSP_UCP': '1',
+    'PSP_HARD_ABORT': '1',
     'UCX_TLS': 'rc_x,cuda_ipc,gdr_copy,self,sm,cuda_copy',
     'UCX_MEMTYPE_CACHE': 'n',
     'UCX_MAX_RNDV_RAILS': '1',