diff --git a/Golden_Repo/i/iomkl/iomkl-2021b.eb b/Golden_Repo/i/iomkl/iomkl-2021b.eb
index e32424be307e035df4e6c95b2ca75848505c198c..6979a5df8ff75b1835c5c6e99abcca8d561b2216 100644
--- a/Golden_Repo/i/iomkl/iomkl-2021b.eb
+++ b/Golden_Repo/i/iomkl/iomkl-2021b.eb
@@ -5,7 +5,6 @@ version = '2021b'
 versionsuffix = ''
 
 local_intelversion = '2021.4.0'
-local_intelsuffix = '-GCC-11.2.0'
 
 homepage = ''
 description = """iomkl provides Intel C/C++ and Fortran compilers, ParaStationMPI & Intel MKL.
@@ -14,9 +13,9 @@ description = """iomkl provides Intel C/C++ and Fortran compilers, ParaStationMP
 toolchain = SYSTEM
 
 dependencies = [
-    ('intel-compilers', local_intelversion, local_intelsuffix),
+    ('intel-compilers', local_intelversion),
     ('OpenMPI', '4.1.1', versionsuffix,
-     ('intel-compilers', local_intelversion + local_intelsuffix)),
+     ('intel-compilers', local_intelversion)),
     ('imkl', local_intelversion, versionsuffix, ('iompi', version)),
 ]
 
diff --git a/Golden_Repo/i/iompi/iompi-2021b.eb b/Golden_Repo/i/iompi/iompi-2021b.eb
index a4d619aa0e1f5b620abeda88ddfa87aaa6f5ee85..f5aae5c97b94f0c535a907fba9b78cc7bb8762fe 100644
--- a/Golden_Repo/i/iompi/iompi-2021b.eb
+++ b/Golden_Repo/i/iompi/iompi-2021b.eb
@@ -10,11 +10,9 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
 toolchain = SYSTEM
 
 local_compver = '2021.4.0'
-local_gccsuffix = '-GCC-11.2.0'
 dependencies = [
-    ('intel-compilers', '%s%s' % (local_compver, local_gccsuffix)),
-    ('OpenMPI', '4.1.1', '', ('intel-compilers', '%s%s' %
-                              (local_compver, local_gccsuffix))),
+    ('intel-compilers', local_comp_ver),
+    ('OpenMPI', '4.1.1', '', ('intel-compilers', local_compver)),
 ]
 
 moduleclass = 'toolchain'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
similarity index 96%
rename from Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0-GCC-11.2.0.eb
rename to Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
index efd0e0566c56cb6afdd35a3ff6b5ddeaad879c5f..6d4a8f88a997f93f22fb0352e9ed5a7617858e21 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0-GCC-11.2.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-intel-compilers-2021.4.0.eb
@@ -6,7 +6,7 @@ version = '4.1.1'
 homepage = 'https://www.open-mpi.org/'
 description = """The Open MPI Project is an open source MPI-3 implementation."""
 
-toolchain = {'name': 'intel-compilers', 'version': '2021.4.0-GCC-11.2.0'}
+toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 toolchainopts = {'pic': True}
 
 source_urls = [