diff --git a/p/PGI/PGI-19.10-GCC-6.3.0-2.27-CUDA.eb b/p/PGI/PGI-19.10-GCC-6.3.0-2.27-CUDA.eb
index bf7d13d5..a12d2d9c 100644
--- a/p/PGI/PGI-19.10-GCC-6.3.0-2.27-CUDA.eb
+++ b/p/PGI/PGI-19.10-GCC-6.3.0-2.27-CUDA.eb
@@ -1,4 +1,5 @@
 # IT4Innovations 2020
+# LK
 
 name = 'PGI'
 version = '19.10'
@@ -21,8 +22,9 @@ dependencies = [
     ('CUDA', '10.0.130'),
 ]
 
-configopts = 'export PGI_INSTALL_MPI=true && '
-configopts += 'export PGI_INSTALL_NVIDIA=true && '
+install_nvidia = 'true'
+install_mpi = 'true'
+install_mpi_gpu = 'true'
 
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
diff --git a/p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb b/p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb
index 361a37ed..a40c8c68 100644
--- a/p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb
+++ b/p/PGI/PGI-20.1-GCC-8.3.0-2.32-CUDA.eb
@@ -13,7 +13,7 @@ sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-
 
 local_local_gccver = '8.3.0'
 local_local_local_binutilsver = '2.32'
-versionsuffix = '-GCC-%s-%s' % (local_local_gccver, local_local_local_binutilsver)
+versionsuffix = '-GCC-%s-%s-CUDA' % (local_local_gccver, local_local_local_binutilsver)
 
 dependencies = [
     ('GCCcore', local_local_gccver),