diff --git a/Custom_Hooks/eb_hooks.py b/Custom_Hooks/eb_hooks.py
index 8ea569d2e88ef99ddac3a8ab6b581f9d302ee008..d879da95b0724145fb05b0c807c29b4dbee788aa 100644
--- a/Custom_Hooks/eb_hooks.py
+++ b/Custom_Hooks/eb_hooks.py
@@ -214,13 +214,13 @@ def parse_hook(ec, *args, **kwargs):
         installation_vetoer(ec)
 
     # Process compiler options
-    ec = inject_compiler_features(ec)
+    ec = inject_compiler_tweaks(ec)
 
     # Process MPI options
-    ec = inject_mpi_features(ec)
+    ec = inject_mpi_tweaks(ec)
 
     # Process UCX options
-    ec = inject_ucx_features(ec)
+    ec = inject_ucx_tweaks(ec)
 
     # Change module name if applicable
     ec = inject_modaltsoftname(ec)
@@ -379,7 +379,7 @@ def inject_modaltsoftname(ec):
     return ec
 
 
-def inject_ucx_features(ec):
+def inject_ucx_tweaks(ec):
     # UCX require to load UCX-settings
     ec_dict = ec.asdict()
     if ec.name in 'UCX' and install_path().lower().startswith('/p/software'):
@@ -400,8 +400,11 @@ end
     return ec
 
 
-def inject_mpi_features(ec):
+def inject_mpi_tweaks(ec):
     ec_dict = ec.asdict()
+    if ec.name == 'impi':
+        ec['set_mpi_wrappers_all'] = 'True'
+        ec.log.info("[parse hook] Injecting set_mpi_wrappers_all = True ")
     # MPIs are a family (in the Lmod sense) and require to load mpi-settings
     if ec.name in SUPPORTED_MPIS and install_path().lower().startswith('/p/software'):
         key = "modluafooter"
@@ -422,7 +425,7 @@ family("mpi")
     return ec
 
 
-def inject_compiler_features(ec):
+def inject_compiler_tweaks(ec):
     ec_dict = ec.asdict()
     # Compilers are are a family (in the Lmod sense)
     if ec.name in SUPPORTED_COMPILERS: