diff --git a/Golden_Repo/m/MUST/MUST-1.8.0-gompi-2022a.eb b/Golden_Repo/m/MUST/MUST-1.8.0-gompi-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b4e26720b96d5ba8ed05e3d20673e90fab543552
--- /dev/null
+++ b/Golden_Repo/m/MUST/MUST-1.8.0-gompi-2022a.eb
@@ -0,0 +1,53 @@
+# 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>
+# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
+# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'CMakeMake'
+
+name = "MUST"
+version = "1.8.0"
+
+homepage = 'https://hpc.rwth-aachen.de/must/'
+description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
+to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
+for application developers that want to develop correct MPI applications. This includes errors that
+already manifest --segmentation faults or incorrect results -- as well as many errors that are not
+visible to the application developer or do not manifest on a certain system or MPI implementation.
+"""
+
+toolchain = {'name': 'gompi', 'version': '2022a'}
+
+source_urls = ['https://hpc.rwth-aachen.de/must/files/']
+sources = ['%(name)s-v%(version)s.tar.gz']
+patches = [
+    'wrap-config.cmake.in.patch',
+]
+checksums = [
+    '9754fefd2e4c8cba812f8b56a5dd929bc84aa599b2509305e1eb8518be0a8a39',  # MUST-v1.8.0.tar.gz
+    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
+]
+
+builddependencies = [
+    ('CMake', '3.23.1'),
+]
+
+dependencies = [
+    ('Graphviz', '5.0.0'),
+    ('libxml2', '2.9.13'),
+    ('Python', '3.10.4'),
+]
+
+configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
+
+sanity_check_paths = {
+    'files': ["bin/mustrun", "include/mustConfig.h"],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/MUST-1.8.0-gpsmpi-2022a.eb b/Golden_Repo/m/MUST/MUST-1.8.0-gpsmpi-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f8cba8685d6adfd2a9575bfff9e2c70befe4aee2
--- /dev/null
+++ b/Golden_Repo/m/MUST/MUST-1.8.0-gpsmpi-2022a.eb
@@ -0,0 +1,53 @@
+# 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>
+# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
+# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'CMakeMake'
+
+name = "MUST"
+version = "1.8.0"
+
+homepage = 'https://hpc.rwth-aachen.de/must/'
+description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
+to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
+for application developers that want to develop correct MPI applications. This includes errors that
+already manifest --segmentation faults or incorrect results -- as well as many errors that are not
+visible to the application developer or do not manifest on a certain system or MPI implementation.
+"""
+
+toolchain = {'name': 'gpsmpi', 'version': '2022a'}
+
+source_urls = ['https://hpc.rwth-aachen.de/must/files/']
+sources = ['%(name)s-v%(version)s.tar.gz']
+patches = [
+    'wrap-config.cmake.in.patch',
+]
+checksums = [
+    '9754fefd2e4c8cba812f8b56a5dd929bc84aa599b2509305e1eb8518be0a8a39',  # MUST-v1.8.0.tar.gz
+    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
+]
+
+builddependencies = [
+    ('CMake', '3.23.1'),
+]
+
+dependencies = [
+    ('Graphviz', '5.0.0'),
+    ('libxml2', '2.9.13'),
+    ('Python', '3.10.4'),
+]
+
+configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
+
+sanity_check_paths = {
+    'files': ["bin/mustrun", "include/mustConfig.h"],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/MUST-1.8.0-ipsmpi-2022a.eb b/Golden_Repo/m/MUST/MUST-1.8.0-ipsmpi-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c457ed2c0f7ffa40cdcc8a1e914149e4369e405
--- /dev/null
+++ b/Golden_Repo/m/MUST/MUST-1.8.0-ipsmpi-2022a.eb
@@ -0,0 +1,53 @@
+# 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>
+# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
+# Authors::   Benedikt Steinbusch <b.steinbusch@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'CMakeMake'
+
+name = "MUST"
+version = "1.8.0"
+
+homepage = 'https://hpc.rwth-aachen.de/must/'
+description = """MUST detects usage errors of the Message Passing Interface (MPI) and reports them
+to the user. As MPI calls are complex and usage errors common, this functionality is extremely helpful
+for application developers that want to develop correct MPI applications. This includes errors that
+already manifest --segmentation faults or incorrect results -- as well as many errors that are not
+visible to the application developer or do not manifest on a certain system or MPI implementation.
+"""
+
+toolchain = {'name': 'ipsmpi', 'version': '2022a'}
+
+source_urls = ['https://hpc.rwth-aachen.de/must/files/']
+sources = ['%(name)s-v%(version)s.tar.gz']
+patches = [
+    'wrap-config.cmake.in.patch',
+]
+checksums = [
+    '9754fefd2e4c8cba812f8b56a5dd929bc84aa599b2509305e1eb8518be0a8a39',  # MUST-v1.8.0.tar.gz
+    'a7adba726fb68f928556dc6e16ad9b624c528a2c807b73e1a61e79a2b2431681',  # wrap-config.cmake.in.patch
+]
+
+builddependencies = [
+    ('CMake', '3.23.1'),
+]
+
+dependencies = [
+    ('Graphviz', '5.0.0'),
+    ('libxml2', '2.9.13'),
+    ('Python', '3.10.4'),
+]
+
+configopts = ' -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR="$EBROOTPYTHON" '
+
+sanity_check_paths = {
+    'files': ["bin/mustrun", "include/mustConfig.h"],
+    'dirs': [],
+}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/m/MUST/wrap-config.cmake.in.patch b/Golden_Repo/m/MUST/wrap-config.cmake.in.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5240d39fd4df30ca52548defd727f9a7bece8c47
--- /dev/null
+++ b/Golden_Repo/m/MUST/wrap-config.cmake.in.patch
@@ -0,0 +1,90 @@
+--- externals/wrap/wrap-config.cmake.in.orig	2020-08-26 21:13:57.739359000 +0200
++++ externals/wrap/wrap-config.cmake.in	2020-08-26 21:05:11.535717000 +0200
+@@ -39,9 +39,9 @@
+ 
+     # Play nice with FindPythonInterp -- use the interpreter if it was found,
+     # otherwise use the script directly.
+-    find_package(PythonInterp 2.6)
+-    if (PYTHON_EXECUTABLE)
+-      set(command ${PYTHON_EXECUTABLE})
++    find_package(Python)
++    if (Python_EXECUTABLE)
++      set(command ${Python_EXECUTABLE})
+       set(script_arg ${Wrap_EXECUTABLE})
+     else()
+       set(command ${Wrap_EXECUTABLE})
+--- externals/GTI/externals/wrap/wrap-config.cmake.in.orig	2020-08-26 21:12:21.579754000 +0200
++++ externals/GTI/externals/wrap/wrap-config.cmake.in	2020-08-26 21:14:34.723726000 +0200
+@@ -39,9 +39,9 @@
+ 
+     # Play nice with FindPythonInterp -- use the interpreter if it was found,
+     # otherwise use the script directly.
+-    find_package(PythonInterp 2.6)
+-    if (PYTHON_EXECUTABLE)
+-      set(command ${PYTHON_EXECUTABLE})
++    find_package(Python)
++    if (Python_EXECUTABLE)
++      set(command ${Python_EXECUTABLE})
+       set(script_arg ${Wrap_EXECUTABLE})
+     else()
+       set(command ${Wrap_EXECUTABLE})
+--- externals/GTI/externals/PnMPI/externals/wrap/wrap-config.cmake.in.orig	2020-08-26 21:13:22.408675000 +0200
++++ externals/GTI/externals/PnMPI/externals/wrap/wrap-config.cmake.in	2020-08-26 21:00:55.200196000 +0200
+@@ -39,9 +39,9 @@
+ 
+     # Play nice with FindPythonInterp -- use the interpreter if it was found,
+     # otherwise use the script directly.
+-    find_package(PythonInterp 2.6)
+-    if (PYTHON_EXECUTABLE)
+-      set(command ${PYTHON_EXECUTABLE})
++    find_package(Python)
++    if (Python_EXECUTABLE)
++      set(command ${Python_EXECUTABLE})
+       set(script_arg ${Wrap_EXECUTABLE})
+     else()
+       set(command ${Wrap_EXECUTABLE})
+--- externals/wrap/WrapConfig.cmake.orig	2021-05-27 10:35:39.000000000 +0200
++++ externals/wrap/WrapConfig.cmake	2021-05-27 10:36:23.000000000 +0200
+@@ -29,9 +29,9 @@
+ 
+     # Play nice with FindPythonInterp -- use the interpreter if it was found,
+     # otherwise use the script directly.
+-    find_package(PythonInterp 2.6)
+-    if (PYTHON_EXECUTABLE)
+-      set(command ${PYTHON_EXECUTABLE})
++    find_package(Python)
++    if (Python_EXECUTABLE)
++      set(command ${Python_EXECUTABLE})
+       set(script_arg ${Wrap_EXECUTABLE})
+     else()
+       set(command ${Wrap_EXECUTABLE})
+--- externals/GTI/externals/wrap/WrapConfig.cmake.orig	2021-05-27 10:35:39.000000000 +0200
++++ externals/GTI/externals/wrap/WrapConfig.cmake	2021-05-27 10:36:23.000000000 +0200
+@@ -29,9 +29,9 @@
+ 
+     # Play nice with FindPythonInterp -- use the interpreter if it was found,
+     # otherwise use the script directly.
+-    find_package(PythonInterp 2.6)
+-    if (PYTHON_EXECUTABLE)
+-      set(command ${PYTHON_EXECUTABLE})
++    find_package(Python)
++    if (Python_EXECUTABLE)
++      set(command ${Python_EXECUTABLE})
+       set(script_arg ${Wrap_EXECUTABLE})
+     else()
+       set(command ${Wrap_EXECUTABLE})
+--- externals/GTI/externals/PnMPI/externals/wrap/WrapConfig.cmake.orig	2021-05-27 10:35:39.000000000 +0200
++++ externals/GTI/externals/PnMPI/externals/wrap/WrapConfig.cmake	2021-05-27 10:36:23.000000000 +0200
+@@ -29,9 +29,9 @@
+ 
+     # Play nice with FindPythonInterp -- use the interpreter if it was found,
+     # otherwise use the script directly.
+-    find_package(PythonInterp 2.6)
+-    if (PYTHON_EXECUTABLE)
+-      set(command ${PYTHON_EXECUTABLE})
++    find_package(Python)
++    if (Python_EXECUTABLE)
++      set(command ${Python_EXECUTABLE})
+       set(script_arg ${Wrap_EXECUTABLE})
+     else()
+       set(command ${Wrap_EXECUTABLE})