diff --git a/Custom_EasyBlocks/psmpi.py b/Custom_EasyBlocks/psmpi.py
index e6a381e0b15978a1432e4b866e805ced8b36aefd..b63b19090b4e840ec42a55684d2057f583bc9107 100644
--- a/Custom_EasyBlocks/psmpi.py
+++ b/Custom_EasyBlocks/psmpi.py
@@ -214,6 +214,7 @@ class EB_psmpi(EB_MPICH):
             toolchain.GCC: 'gcc',
             toolchain.INTELCOMP: 'intel',
             toolchain.PGI: 'pgi',
+            toolchain.NVHPC: 'nvhpc',
         }
 
         # ParaStationMPI defines its environment through confsets. So these should be unset
@@ -229,7 +230,10 @@ class EB_psmpi(EB_MPICH):
         # Set confset
         comp_fam = self.toolchain.comp_family()
         if comp_fam in comp_opts:
-            self.cfg.update('configopts', ' --with-confset=%s' % comp_opts[comp_fam])
+            if comp_opts[comp_fam] is comp_opts[toolchain.NVHPC]:
+                self.cfg.update('configopts', ' --with-confset=%s' % comp_opts[toolchain.PGI])
+            else:
+                self.cfg.update('configopts', ' --with-confset=%s' % comp_opts[comp_fam])
         else:
             raise EasyBuildError("Compiler %s not supported. Valid options are: %s",
                                  comp_fam, ', '.join(comp_opts.keys()))