diff --git a/i/iompi/iompi-2020b-test.eb b/i/iompi/iompi-2020b.eb
similarity index 79%
rename from i/iompi/iompi-2020b-test.eb
rename to i/iompi/iompi-2020b.eb
index b09aa5d8..769e5b5c 100644
--- a/i/iompi/iompi-2020b-test.eb
+++ b/i/iompi/iompi-2020b.eb
@@ -5,7 +5,6 @@ easyblock = "Toolchain"
 
 name = 'iompi'
 version = '2020b'
-versionsuffix = '-test'
 
 homepage = 'https://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
 description = """Intel C/C++ and Fortran compilers, alongside Open MPI."""
@@ -16,7 +15,7 @@ local_compver = '2020.4.304'
 
 dependencies = [
     ('iccifort', local_compver),
-    ('OpenMPI', '4.0.5', versionsuffix, ('iccifort', local_compver)),
+    ('OpenMPI', '4.0.5', '', ('iccifort', local_compver)),
 ]
 
 moduleclass = 'toolchain'
diff --git a/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304-test.eb b/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304.eb
similarity index 99%
rename from o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304-test.eb
rename to o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304.eb
index 6855d241..f87c3fa1 100644
--- a/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304-test.eb
+++ b/o/OpenMPI/OpenMPI-4.0.5-iccifort-2020.4.304.eb
@@ -3,7 +3,6 @@
 
 name = 'OpenMPI'
 version = '4.0.5'
-versionsuffix = '-test'
 
 homepage = 'https://www.open-mpi.org/'
 description = """The Open MPI Project is an open source MPI-3 implementation."""
diff --git a/s/Score-P/Score-P-8.0-iimpi-2021b.eb b/s/Score-P/Score-P-8.0-iimpi-2021b.eb
new file mode 100644
index 00000000..0452f881
--- /dev/null
+++ b/s/Score-P/Score-P-8.0-iimpi-2021b.eb
@@ -0,0 +1,48 @@
+# IT4Innovations 2023
+# JK
+
+name = 'Score-P'
+version = '8.0'
+
+homepage = 'https://www.score-p.org'
+description = """
+ The Score-P measurement infrastructure is a highly scalable and easy-to-use
+ tool suite for profiling, event tracing, and online analysis of HPC
+ applications.
+"""
+
+toolchain = {'name': 'iimpi', 'version': '2021b'}
+
+source_urls = ['https://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
+sources = ['scorep-%(version)s.tar.gz']
+checksums = ['4c0f34f20999f92ebe6ca1ff706d0846b8ce6cd537ffbedb49dfaef0faa66311']
+
+dependencies = [
+    ('CubeLib', '4.8'),
+    ('CubeWriter', '4.8'),
+    ('libunwind', '1.5.0'),
+    ('OPARI2', '2.0.7'),
+    ('OTF2', '3.0.2'),
+    # Hardware counter support (optional):
+    ('PAPI', '6.0.0.1'),
+    # PDT source-to-source instrumentation support (optional):
+    ('PDT', '3.25.1'),
+]
+
+configopts = '--enable-shared'
+
+local_adapters = [
+    'compiler_event', 'compiler_mgmt', 'mpi_event', 'mpi_mgmt', 'opari2_mgmt', 'user_event', 'user_mgmt'
+]
+sanity_check_paths = {
+    'files':
+        ['bin/scorep', 'include/scorep/SCOREP_User.h'] +
+        ['lib/libscorep_adapter_%s.%s' % (a, e) for a in local_adapters for e in ('a', SHLIB_EXT)],
+    'dirs': [],
+}
+sanity_check_commands = ['scorep-config --help']
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'