diff --git a/Golden_Repo/s/Score-P/Score-P-8.1-gompi-2022a.eb b/Golden_Repo/s/Score-P/Score-P-8.1-gompi-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..322e24504bfaa6c3941bf7699eb8b543344ed118
--- /dev/null
+++ b/Golden_Repo/s/Score-P/Score-P-8.1-gompi-2022a.eb
@@ -0,0 +1,67 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2023 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+#             Markus Geimer <m.geimer@fz-juelich.de>
+#             Christian Feld <c.feld@fz-juelich.de>
+# License::   3-clause BSD
+#
+# This work is based on experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '8.1'
+
+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': 'gompi', 'version': '2022a'}
+
+source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
+sources = ['scorep-%(version)s.tar.gz']
+checksums = [
+    '3a40b481fce610871ddf6bdfb88a6d06b9e5eb38c6080faac6d5e44990060a37',  # scorep-8.1.tar.gz
+]
+
+builddependencies = [
+    ('CUDA', '11.7', '', SYSTEM),
+    ('CubeLib', '4.8.1'),
+    ('CubeWriter', '4.8.1'),
+    # Unwinding/sampling support (optional):
+    ('libunwind', '1.6.2'),
+]
+
+dependencies = [
+    # binutils is implicitly available via GCC toolchain
+    ('OPARI2', '2.0.7'),
+    ('OTF2', '3.0.3'),
+    # Hardware counter support (optional):
+    ('PAPI', '7.0.0'),
+]
+
+configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
+# Enable CUDA support
+configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux '
+# Make OMPT default, if available
+configopts += '--enable-default=ompt '
+
+postinstallcmds = ['make installcheck']
+
+sanity_check_paths = {
+    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
+              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
+              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-8.1-gpsmpi-2022a.eb b/Golden_Repo/s/Score-P/Score-P-8.1-gpsmpi-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ac63d8bbb423b929edf36c9d4ce03a64ce2408af
--- /dev/null
+++ b/Golden_Repo/s/Score-P/Score-P-8.1-gpsmpi-2022a.eb
@@ -0,0 +1,67 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2023 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+#             Markus Geimer <m.geimer@fz-juelich.de>
+#             Christian Feld <c.feld@fz-juelich.de>
+# License::   3-clause BSD
+#
+# This work is based on experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '8.1'
+
+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': 'gpsmpi', 'version': '2022a'}
+
+source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
+sources = ['scorep-%(version)s.tar.gz']
+checksums = [
+    '3a40b481fce610871ddf6bdfb88a6d06b9e5eb38c6080faac6d5e44990060a37',  # scorep-8.1.tar.gz
+]
+
+builddependencies = [
+    ('CUDA', '11.7', '', SYSTEM),
+    ('CubeLib', '4.8.1'),
+    ('CubeWriter', '4.8.1'),
+    # Unwinding/sampling support (optional):
+    ('libunwind', '1.6.2'),
+]
+
+dependencies = [
+    # binutils is implicitly available via GCC toolchain
+    ('OPARI2', '2.0.7'),
+    ('OTF2', '3.0.3'),
+    # Hardware counter support (optional):
+    ('PAPI', '7.0.0'),
+]
+
+configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
+# Enable CUDA support
+configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux '
+# Make OMPT default, if available
+configopts += '--enable-default=ompt '
+
+postinstallcmds = ['make installcheck']
+
+sanity_check_paths = {
+    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
+              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
+              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-8.1-ipsmpi-2022a.eb b/Golden_Repo/s/Score-P/Score-P-8.1-ipsmpi-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c4b609723f5ba69f2efb3715e03aaf359f9f490
--- /dev/null
+++ b/Golden_Repo/s/Score-P/Score-P-8.1-ipsmpi-2022a.eb
@@ -0,0 +1,67 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2023 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+#             Markus Geimer <m.geimer@fz-juelich.de>
+#             Christian Feld <c.feld@fz-juelich.de>
+# License::   3-clause BSD
+#
+# This work is based on experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '8.1'
+
+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': 'ipsmpi', 'version': '2022a'}
+
+source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
+sources = ['scorep-%(version)s.tar.gz']
+checksums = [
+    '3a40b481fce610871ddf6bdfb88a6d06b9e5eb38c6080faac6d5e44990060a37',  # scorep-8.1.tar.gz
+]
+
+builddependencies = [
+    ('CUDA', '11.7', '', SYSTEM),
+    ('CubeLib', '4.8.1'),
+    ('CubeWriter', '4.8.1'),
+    # Unwinding/sampling support (optional):
+    ('libunwind', '1.6.2'),
+]
+
+dependencies = [
+    # binutils is implicitly available via GCC toolchain
+    ('OPARI2', '2.0.7'),
+    ('OTF2', '3.0.3'),
+    # Hardware counter support (optional):
+    ('PAPI', '7.0.0'),
+]
+
+configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
+# Enable CUDA support
+configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux '
+# Make OMPT default, if available
+configopts += '--enable-default=ompt '
+
+postinstallcmds = ['make installcheck']
+
+sanity_check_paths = {
+    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
+              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
+              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-8.1-npsmpic-2022a.eb b/Golden_Repo/s/Score-P/Score-P-8.1-npsmpic-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..17d41f01eef781abdf5c54f9ae6cf8ab7a229b27
--- /dev/null
+++ b/Golden_Repo/s/Score-P/Score-P-8.1-npsmpic-2022a.eb
@@ -0,0 +1,67 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2023 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+#             Markus Geimer <m.geimer@fz-juelich.de>
+#             Christian Feld <c.feld@fz-juelich.de>
+# License::   3-clause BSD
+#
+# This work is based on experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '8.1'
+
+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': 'npsmpic', 'version': '2022a'}
+
+source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
+sources = ['scorep-%(version)s.tar.gz']
+checksums = [
+    '3a40b481fce610871ddf6bdfb88a6d06b9e5eb38c6080faac6d5e44990060a37',  # scorep-8.1.tar.gz
+]
+
+builddependencies = [
+    ('CUDA', '11.7', '', SYSTEM),
+    ('CubeLib', '4.8.1'),
+    ('CubeWriter', '4.8.1'),
+    # Unwinding/sampling support (optional):
+    ('libunwind', '1.6.2'),
+]
+
+dependencies = [
+    # binutils is implicitly available via GCC toolchain
+    ('OPARI2', '2.0.7'),
+    ('OTF2', '3.0.3'),
+    # Hardware counter support (optional):
+    ('PAPI', '7.0.0'),
+]
+
+configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
+# Enable CUDA support
+configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux '
+# Make OMPT default, if available
+configopts += '--enable-default=ompt '
+
+postinstallcmds = ['make installcheck']
+
+sanity_check_paths = {
+    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
+              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
+              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Score-P/Score-P-8.1-nvompic-2022a.eb b/Golden_Repo/s/Score-P/Score-P-8.1-nvompic-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2464a970ac4184b5fee64a350378ff63f809648b
--- /dev/null
+++ b/Golden_Repo/s/Score-P/Score-P-8.1-nvompic-2022a.eb
@@ -0,0 +1,67 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2023 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+#             Markus Geimer <m.geimer@fz-juelich.de>
+#             Christian Feld <c.feld@fz-juelich.de>
+# License::   3-clause BSD
+#
+# This work is based on experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+
+easyblock = 'EB_Score_minus_P'
+
+name = 'Score-P'
+version = '8.1'
+
+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': 'nvompic', 'version': '2022a'}
+
+source_urls = ['http://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%(version)s']
+sources = ['scorep-%(version)s.tar.gz']
+checksums = [
+    '3a40b481fce610871ddf6bdfb88a6d06b9e5eb38c6080faac6d5e44990060a37',  # scorep-8.1.tar.gz
+]
+
+builddependencies = [
+    ('CUDA', '11.7', '', SYSTEM),
+    ('CubeLib', '4.8.1'),
+    ('CubeWriter', '4.8.1'),
+    # Unwinding/sampling support (optional):
+    ('libunwind', '1.6.2'),
+]
+
+dependencies = [
+    # binutils is implicitly available via GCC toolchain
+    ('OPARI2', '2.0.7'),
+    ('OTF2', '3.0.3'),
+    # Hardware counter support (optional):
+    ('PAPI', '7.0.0'),
+]
+
+configopts = '--enable-shared --with-machine-name=$SYSTEMNAME '
+# Enable CUDA support
+configopts += '--with-libOpenCL=$EBROOTCUDA/targets/x86_64-linux '
+# Make OMPT default, if available
+configopts += '--enable-default=ompt '
+
+postinstallcmds = ['make installcheck']
+
+sanity_check_paths = {
+    'files': ['bin/scorep', 'include/scorep/SCOREP_User.h',
+              ('lib/libscorep_adapter_mpi_event.a', 'lib64/libscorep_adapter_mpi_event.a'),
+              ('lib/libscorep_adapter_mpi_event.%s' % SHLIB_EXT, 'lib64/libscorep_adapter_mpi_event.%s' % SHLIB_EXT)],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scorep/profile'}
+
+moduleclass = 'perf'