diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-gompi-2020.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-gompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1070167d151f682f79c14efd6ed51c766a649384
--- /dev/null
+++ b/Golden_Repo/s/Scalasca/Scalasca-2.6-gompi-2020.eb
@@ -0,0 +1,55 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'gompi', 'version': '2020'}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-gpsmpi-2020.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-gpsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cb5f53f54ca7c43365ee82bafdbb5e00051a6c7d
--- /dev/null
+++ b/Golden_Repo/s/Scalasca/Scalasca-2.6-gpsmpi-2020.eb
@@ -0,0 +1,55 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'gpsmpi', 'version': '2020'}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-iimpi-2020.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-iimpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e628e11ad638988b74643084f13e550e5d8076e2
--- /dev/null
+++ b/Golden_Repo/s/Scalasca/Scalasca-2.6-iimpi-2020.eb
@@ -0,0 +1,55 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'iimpi', 'version': '2020'}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-iompi-2020.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-iompi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f8bb13707834ead114380e17577fd1a11cfc44cb
--- /dev/null
+++ b/Golden_Repo/s/Scalasca/Scalasca-2.6-iompi-2020.eb
@@ -0,0 +1,55 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'iompi', 'version': '2020'}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-ipsmpi-2020.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-ipsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..13974fe405faefb4b107fd0219f3c20c9cf59f43
--- /dev/null
+++ b/Golden_Repo/s/Scalasca/Scalasca-2.6-ipsmpi-2020.eb
@@ -0,0 +1,55 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'ipsmpi', 'version': '2020'}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2.6-npsmpic-2020.eb b/Golden_Repo/s/Scalasca/Scalasca-2.6-npsmpic-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c68493571991976adc8c9382eb39a8e01fe97ab
--- /dev/null
+++ b/Golden_Repo/s/Scalasca/Scalasca-2.6-npsmpic-2020.eb
@@ -0,0 +1,55 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'npsmpic', 'version': '2020'}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-gpsmpi-2020.eb b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-gpsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..93148d505137576ec071d517efdb73ce28fc5846
--- /dev/null
+++ b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-gpsmpi-2020.eb
@@ -0,0 +1,59 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'gpsmpi', 'version': '2020'}
+# Building with architectural optimizations on the KNL booster prevents
+# using the frontend tools on the frontend, and thus cross-compilation.
+# But Score-P/Scalasca does not benefit much from vectorization anyway.
+toolchainopts = {'optarch': False}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-iimpi-2020.eb b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-iimpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..90c9161c1cd0266b484afd9d6be82a254b694888
--- /dev/null
+++ b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-iimpi-2020.eb
@@ -0,0 +1,59 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'iimpi', 'version': '2020'}
+# Building with architectural optimizations on the KNL booster prevents
+# using the frontend tools on the frontend, and thus cross-compilation.
+# But Score-P/Scalasca does not benefit much from vectorization anyway.
+toolchainopts = {'optarch': False}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'
diff --git a/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-ipsmpi-2020.eb b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-ipsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..76e40a24c71715423aa83df37fe268e29dbc7013
--- /dev/null
+++ b/Overlays/jurecabooster_overlay/s/Scalasca/Scalasca-2.6-ipsmpi-2020.eb
@@ -0,0 +1,59 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/easybuilders/easybuild
+# Copyright:: Copyright 2013-2021 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 = 'Scalasca'
+version = '2.6'
+
+homepage = 'https://www.scalasca.org/'
+description = """
+Scalasca is a software tool that supports the performance optimization of
+parallel programs by measuring and analyzing their runtime behavior. The
+analysis identifies potential performance bottlenecks -- in particular
+those concerning communication and synchronization -- and offers guidance
+in exploring their causes.
+"""
+
+site_contacts = 'Software Analysis and Tools <swat@fz-juelich.de>'
+
+toolchain = {'name': 'ipsmpi', 'version': '2020'}
+# Building with architectural optimizations on the KNL booster prevents
+# using the frontend tools on the frontend, and thus cross-compilation.
+# But Score-P/Scalasca does not benefit much from vectorization anyway.
+toolchainopts = {'optarch': False}
+
+source_urls = ['https://apps.fz-juelich.de/scalasca/releases/scalasca/%(version_major_minor)s/dist']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = [
+    'b3f9cb1d58f3e25090a39da777bae8ca2769fd10cbd6dfb9a4887d873ee2441e',  # scalasca-2.6.tar.gz
+]
+builddependencies = [
+    ('CubeWriter', '4.6'),
+]
+
+dependencies = [
+    ('CubeGUI', '4.6'),
+    ('CubeLib', '4.6'),
+    ('OTF2', '2.3'),
+    ('Score-P', '7.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/scalasca', ('lib/libpearl.replay.a', 'lib64/libpearl.replay.a')],
+    'dirs': [],
+}
+
+# Ensure that local metric documentation is found by CubeGUI
+modextrapaths = {'CUBE_DOCPATH': 'share/doc/scalasca/patterns'}
+
+moduleclass = 'perf'