diff --git a/Custom_Hooks/eb_hooks.py b/Custom_Hooks/eb_hooks.py
index e4346aa4db289d39c40661b6aa592fc9504561a6..0e7663c6b23501d3d5082c0a38ac8aa2b3c0a4f7 100644
--- a/Custom_Hooks/eb_hooks.py
+++ b/Custom_Hooks/eb_hooks.py
@@ -237,6 +237,8 @@ def parse_hook(ec, *args, **kwargs):
 
     ec = tweak_moduleclass(ec)
 
+    ec = tweak_module_conflict_side_compilers(ec)
+
     # If we are parsing we are not searching, in this case if the easyconfig is
     # located in the search path, warn that it's dependencies will (most probably)
     # not be resolved
@@ -296,6 +298,22 @@ def tweak_moduleclass(ec):
     return ec
 
 
+def tweak_module_conflict_side_compilers(ec):
+    ec_dict = ec.asdict()
+    if ec['name'] in SIDECOMPILERS:
+        key = "modluafooter"
+        value = 'conflict(%s)' % ','.join('"'+x+'"' for x in SIDECOMPILERS)
+        if key in ec_dict:
+            if not value in ec_dict[key]:
+                ec[key] = "\n".join([ec_dict[key], value])
+        else:
+            ec[key] = value
+        ec.log.info(
+            "[parse hook] Injecting Lmod conflict property for SIDECOMPILERS")
+
+    return ec
+
+
 def inject_site_contact_and_user_labels(ec):
     ec_dict = ec.asdict()
     # Check where installations are going to go and add appropriate site contact
diff --git a/Golden_Repo/c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb b/Golden_Repo/c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..135209dc002389aac79d8516ce323b6ca860eb65
--- /dev/null
+++ b/Golden_Repo/c/Clang/Clang-13.0.1-GCCcore-11.2.0.eb
@@ -0,0 +1,111 @@
+# For using $SYSTEMNAME to determine compute capability. The local prefix is to appease the checker
+import os as local_os
+
+##
+# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
+#
+# Copyright:: Copyright 2013-2015 Dmitri Gribenko, Ward Poelmans
+# Authors:: Dmitri Gribenko <gribozavr@gmail.com>
+# Authors:: Ward Poelmans <wpoely86@gmail.com>
+# License:: GPLv2 or later, MIT, three-clause BSD.
+# $Id$
+##
+
+name = 'Clang'
+version = '13.0.1'
+
+homepage = 'https://clang.llvm.org/'
+description = """C, C++, Objective-C compiler, based on LLVM.  Does not
+ include C++ standard library -- use libstdc++ from GCC."""
+
+# Clang also depends on libstdc++ during runtime, but this dependency is
+# already specified as the toolchain.
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [
+    "https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s"]
+sources = [
+    'llvm-%(version)s.src.tar.xz',
+    'clang-%(version)s.src.tar.xz',
+    'compiler-rt-%(version)s.src.tar.xz',
+    'polly-%(version)s.src.tar.xz',
+    'openmp-%(version)s.src.tar.xz',
+    # Also include the LLVM linker
+    'lld-%(version)s.src.tar.xz',
+    'libcxx-%(version)s.src.tar.xz',
+    'libcxxabi-%(version)s.src.tar.xz',
+    'clang-tools-extra-%(version)s.src.tar.xz',
+    'libunwind-%(version)s.src.tar.xz',
+]
+checksums = [
+    # llvm-13.0.1.src.tar.xz
+    'ec6b80d82c384acad2dc192903a6cf2cdbaffb889b84bfb98da9d71e630fc834',
+    # clang-13.0.1.src.tar.xz
+    '787a9e2d99f5c8720aa1773e4be009461cd30d3bd40fdd24591e473467c917c9',
+    # compiler-rt-13.0.1.src.tar.xz
+    '7b33955031f9a9c5d63077dedb0f99d77e4e7c996266952c1cec55626dca5dfc',
+    # polly-13.0.1.src.tar.xz
+    'f4003e03da57b53bf206faadd0cf53f7b198c38498c605dec45743db23c10ad0',
+    # openmp-13.0.1.src.tar.xz
+    '6b79261371616c31fea18cd3ee1797c79ee38bcaf8417676d4fa366a24c96b4f',
+    # lld-13.0.1.src.tar.xz
+    '666af745e8bf7b680533b4d18b7a31dc7cab575b1e6e4d261922bbafd9644cfb',
+    # libcxx-13.0.1.src.tar.xz
+    '2f446acc00bb7cfb4e866c2fa46d1b6dbf4e7d2ab62e3c3d84e56f7b9e28110f',
+    # libcxxabi-13.0.1.src.tar.xz
+    'db5fa6093c786051e8b1c85527240924eceb6c95eeff0a2bbc57be8422b3cef1',
+    # clang-tools-extra-13.0.1.src.tar.xz
+    'cc2bc8598848513fa2257a270083e986fd61048347eccf1d801926ea709392d0',
+    # libunwind-13.0.1.src.tar.xz
+    'e206dbf1bbe058a113bffe189386ded99a160b2443ee1e2cd41ff810f78551ba',
+]
+
+dependencies = [
+    # since Clang is a compiler, binutils is a runtime dependency too
+    ('binutils', '2.37'),
+    ('hwloc', '2.5.0'),
+    ('libxml2', '2.9.10'),
+    ('ncurses', '6.2'),
+    ('GMP', '6.2.1'),
+    ('Z3', '4.8.12'),
+]
+
+builddependencies = [
+    ('CMake', '3.21.1'),
+    ('Python', '3.9.6'),
+    ('Perl', '5.34.0'),
+    ('elfutils', '0.185'),
+]
+
+default_cuda_capability = {
+    'juwels': '7.0',
+    'juwelsbooster': '8.0',
+    'jurecadc': '8.0',
+    'jusuf': '7.0',
+    'hdfml': '7.0'
+}[local_os.environ['SYSTEMNAME']]
+
+configopts = '-DLIBOMP_INSTALL_ALIASES=OFF'
+
+assertions = True
+usepolly = True
+build_lld = True
+libcxx = True
+enable_rtti = True
+build_extra_clang_tools = True
+
+skip_all_tests = True
+
+sanity_check_paths = {
+    'files': ['bin/clang', 'bin/clang++', 'bin/llvm-ar', 'bin/llvm-nm',
+              'bin/llvm-as', 'bin/opt', 'bin/llvm-link', 'bin/llvm-config',
+              'bin/llvm-symbolizer', 'include/llvm-c/Core.h', 'include/clang-c/Index.h',
+              'lib/libclang.so', 'lib/clang/13.0.1/include/stddef.h', 'bin/scan-build',
+              'bin/scan-view', 'bin/clang-tidy', 'lib/LLVMPolly.so', 'bin/lld',
+              'lib/libc++.so', 'lib/libc++abi.so', 'lib/libomp.so',
+              'lib/clang/13.0.1/include/omp.h', 'lib/libomptarget.so',
+              'lib/libomptarget.rtl.cuda.so', 'lib/libomptarget.rtl.x86_64.so'],
+    'dirs': ['include/clang', 'include/llvm', 'lib/clang/13.0.1/lib', 'include/polly'],
+}
+
+moduleclass = 'sidecompiler'
diff --git a/Golden_Repo/c/Colmap/Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/c/Colmap/Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e2a6ee22ea6ca88adf3d729dee8ca89bb6c8dc4c
--- /dev/null
+++ b/Golden_Repo/c/Colmap/Colmap-3.7-gcccoremkl-11.2.0-2021.4.0.eb
@@ -0,0 +1,48 @@
+easyblock = 'CMakeMake'
+
+name = 'Colmap'
+version = '3.7'
+
+homepage = 'https://colmap.github.io'
+description = """COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline
+with a graphical and command-line interface.
+"""
+
+toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
+toolchainopts = {'cstd': 'c++14'}
+
+github_account = 'colmap'
+source_urls = [GITHUB_SOURCE]
+sources = ['%(version)s.tar.gz']
+checksums = ['ceb7cca204550d65b890cd0082c66f4bc69193daf9da64616d8147a46b76cc55']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+]
+
+dependencies = [
+    ('Eigen', '3.3.9'),
+    ('Boost', '1.78.0'),
+    ('gflags', '2.2.2'),
+    ('glog', '0.5.0'),
+    ('SuiteSparse', '5.10.1', '-nompi'),
+    ('CGAL', '5.2'),
+    ('ceres-solver', '2.0.0'),
+    ('FreeImage', '3.18.0'),
+    ('CUDA', '11.5', '', SYSTEM),
+    ('OpenGL', '2021b'),
+    ('Qt5', '5.15.2'),
+]
+
+configopts = "-DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF "
+configopts += "-DCUDA_ENABLED=ON "
+configopts += "-DCUDA_ARCHS='%(cuda_cc_space_sep)s' "
+configopts += "-DCUDA_NVCC_FLAGS='--std c++14' "
+
+sanity_check_paths = {
+    'files': ['bin/colmap', 'lib/colmap/libcolmap.a'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/c/ceres-solver/ceres-solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/c/ceres-solver/ceres-solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b5de316ca75467a0661a3134854e2e17eae48dd
--- /dev/null
+++ b/Golden_Repo/c/ceres-solver/ceres-solver-2.0.0-gcccoremkl-11.2.0-2021.4.0.eb
@@ -0,0 +1,38 @@
+easyblock = 'CMakeMake'
+
+name = 'ceres-solver'
+version = '2.0.0'
+
+homepage = 'http://ceres-solver.org'
+description = """
+Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems.
+"""
+
+toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://ceres-solver.org/']
+sources = ['%(name)s-%(version)s.tar.gz']
+checksums = ['10298a1d75ca884aa0507d1abb0e0f04800a92871cd400d4c361b56a777a7603']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1', '', SYSTEM)
+]
+
+dependencies = [
+    ('Eigen', '3.3.9'),
+    ('SuiteSparse', '5.10.1', '-nompi'),  # ('gcccoremkl', '11.2.0-2021.4.0')),
+    ('gflags', '2.2.2'),
+    ('glog', '0.5.0'),
+]
+
+configopts = '-DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF '
+configopts += '-DBUILD_SHARED_LIBS=on '
+
+sanity_check_paths = {
+    'files': ['lib/libceres.so', 'include/ceres/ceres.h'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/elfutils/elfutils-0.185-GCCcore-11.2.0.eb b/Golden_Repo/e/elfutils/elfutils-0.185-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e71a4d7646ed97331fe6f311556d51795fa96048
--- /dev/null
+++ b/Golden_Repo/e/elfutils/elfutils-0.185-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'elfutils'
+version = '0.185'
+
+homepage = 'https://elfutils.org/'
+
+description = """
+ The elfutils project provides libraries and tools for ELF files
+ and DWARF data.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://sourceware.org/elfutils/ftp/%(version)s/']
+sources = [SOURCE_TAR_BZ2]
+checksums = ['dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6']
+
+builddependencies = [
+    ('M4', '1.4.19'),
+    ('pkg-config', '0.29.2'),
+]
+
+dependencies = [
+    ('binutils', '2.37'),
+    ('bzip2', '1.0.8'),
+    ('libarchive', '3.5.1'),
+    ('XZ', '5.2.5'),
+    ('zstd', '1.5.0'),
+]
+
+configopts = "--disable-debuginfod --disable-libdebuginfod"
+
+sanity_check_paths = {
+    'files': ['bin/eu-elfcmp', 'include/dwarf.h', 'lib/libelf.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+sanity_check_commands = ["eu-elfcmp --help"]
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/f/FreeImage/FreeImage-3.18.0-GCCcore-11.2.0.eb b/Golden_Repo/f/FreeImage/FreeImage-3.18.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7eca59b715bd4a7220dfca1c288bed1fc25976e8
--- /dev/null
+++ b/Golden_Repo/f/FreeImage/FreeImage-3.18.0-GCCcore-11.2.0.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'FreeImage'
+version = '3.18.0'
+
+homepage = 'http://freeimage.sourceforge.net'
+description = """FreeImage is an Open Source library project for developers who would like to support popular graphics
+image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications. FreeImage is easy to
+use, fast, multithreading safe."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'pic': True, 'cstd': 'c++11'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(name)s%s.zip' % ''.join(version.split('.'))]
+patches = ['%(name)s-%(version)s-fix-makefile.patch']
+checksums = [
+    'f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd',  # FreeImage3180.zip
+    '3eaa1eb9562ccfd0cb95a37879bb7e3e8c745166596d75af529478181ef006a0',  # FreeImage-3.18.0-fix-makefile.patch
+]
+
+builddependencies = [('binutils', '2.37')]
+
+skipsteps = ['configure']
+
+buildopts = ['', '-f Makefile.fip']
+installopts = [
+    'INCDIR=%(installdir)s/include INSTALLDIR=%(installdir)s/lib',
+    '-f Makefile.fip INCDIR=%(installdir)s/include INSTALLDIR=%(installdir)s/lib'
+]
+
+dependencies = [('zlib', '1.2.11')]
+
+sanity_check_paths = {
+    'files': ['include/FreeImage.h', 'include/FreeImagePlus.h', 'lib/libfreeimage.a', 'lib/libfreeimage.%s' % SHLIB_EXT,
+              'lib/libfreeimageplus.a', 'lib/libfreeimageplus.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/f/FreeImage/FreeImage-3.18.0-fix-makefile.patch b/Golden_Repo/f/FreeImage/FreeImage-3.18.0-fix-makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ac35040d4d637adaf48ca909d3988ead0e628f07
--- /dev/null
+++ b/Golden_Repo/f/FreeImage/FreeImage-3.18.0-fix-makefile.patch
@@ -0,0 +1,54 @@
+# Do not install files to root user
+# wpoely86@gmail.com
+diff -ur FreeImage.orig/Makefile.fip FreeImage/Makefile.fip
+--- FreeImage.orig/Makefile.fip	2015-03-10 09:03:56.000000000 +0100
++++ FreeImage/Makefile.fip	2019-04-09 10:32:42.052332853 +0200
+@@ -11,7 +11,7 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++LIBRARIES = -lstdc++ $(LIBS)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -72,10 +72,10 @@
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 644 $(HEADER) $(INCDIR)
++	install -m 644 $(HEADERFIP) $(INCDIR)
++	install -m 644 $(STATICLIB) $(INSTALLDIR)
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+ 
+diff -ur FreeImage.orig/Makefile.gnu FreeImage/Makefile.gnu
+--- FreeImage.orig/Makefile.gnu	2015-03-10 09:04:00.000000000 +0100
++++ FreeImage/Makefile.gnu	2019-04-09 10:31:59.066052732 +0200
+@@ -11,7 +11,7 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++LIBRARIES = -lstdc++ $(LIBS)
+ 
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -71,9 +71,9 @@
+ 
+ install:
+ 	install -d $(INCDIR) $(INSTALLDIR)
+-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
+-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	install -m 644 $(HEADER) $(INCDIR)
++	install -m 644 $(STATICLIB) $(INSTALLDIR)
++	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+ #	ldconfig
diff --git a/Golden_Repo/g/GStreamer/GStreamer-1.18.6-GCCcore-11.2.0.eb b/Golden_Repo/g/GStreamer/GStreamer-1.18.6-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f23a11eb14afcd7c73056ea3510b3b823954a180
--- /dev/null
+++ b/Golden_Repo/g/GStreamer/GStreamer-1.18.6-GCCcore-11.2.0.eb
@@ -0,0 +1,74 @@
+easyblock = 'Bundle'
+
+name = 'GStreamer'
+version = '1.18.6'
+
+homepage = 'https://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('Meson', '0.58.2'),
+    ('Ninja', '1.10.2'),
+    ('Bison', '3.7.6'),
+    ('flex', '2.6.4'),
+    ('pkg-config', '0.29.2'),
+    ('CMake', '3.21.1', '', SYSTEM),
+    ('GObject-Introspection', '1.68.0'),
+    ('git', '2.33.1', '-nodocs'),
+]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('GMP', '6.2.1'),
+    ('GSL', '2.7'),
+    ('GLib', '2.69.1'),
+    ('GTK+', '3.24.23'),
+    ('libunwind', '1.5.0'),
+    ('gettext', '0.21'),
+]
+
+default_easyblock = 'MesonNinja'
+
+default_component_specs = {
+    'sources': [SOURCELOWER_TAR_XZ],
+    'start_dir': '%(namelower)s-%(version)s',
+}
+
+components = [
+    (name, version, {
+        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
+        'checksums': ['4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6'],
+        'configopts': "-Dlibdw=disabled ",
+    }),
+    ('GST-plugins-base', '1.18.6', {
+        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
+        'checksums': ['56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b'],
+        'preconfigopts': 'export PKG_CONFIG_PATH="%(installdir)s/lib/pkgconfig:${PKG_CONFIG_PATH}" && ',
+    }),
+    ('GST-plugins-good', '1.18.6', {
+        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
+        'checksums': ['26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed'],
+        'preconfigopts': 'export PKG_CONFIG_PATH="%(installdir)s/lib/pkgconfig:${PKG_CONFIG_PATH}" && ',
+    }),
+    ('GST-plugins-bad', '1.18.6', {
+        'source_urls': ['https://gstreamer.freedesktop.org/src/%(namelower)s'],
+        'checksums': ['0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9'],
+        'preconfigopts': 'export PKG_CONFIG_PATH="%(installdir)s/lib/pkgconfig:${PKG_CONFIG_PATH}" && ',
+    }),
+]
+
+modextrapaths = {'PKG_CONFIG_PATH': 'lib/pkgconfig'}
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-1.0' % x for x in ['discoverer', 'play', 'device-monitor']] +
+             ['lib/libgst%s-1.0.%s' % (x, SHLIB_EXT) for x in ['app', 'audio', 'video']],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/g/glog/glog-0.5.0-GCCcore-11.2.0.eb b/Golden_Repo/g/glog/glog-0.5.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..842305bc178dab7639685c09899caa0eadea30c8
--- /dev/null
+++ b/Golden_Repo/g/glog/glog-0.5.0-GCCcore-11.2.0.eb
@@ -0,0 +1,33 @@
+easyblock = 'CMakeMake'
+
+name = 'glog'
+version = '0.5.0'
+
+homepage = 'https://github.com/google/glog'
+description = "A C++ implementation of the Google logging module."
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'cstd': 'c++11'}
+
+source_urls = ['https://github.com/google/glog/archive/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1', '', SYSTEM)
+]
+
+dependencies = [
+    ('gflags', '2.2.2'),
+    ('libunwind', '1.5.0'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON '
+
+sanity_check_paths = {
+    'files': ['include/glog/logging.h', 'include/glog/raw_logging.h', 'lib/libglog.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb b/Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
index 7ce183ecb718fc057beac719f8282bdc4b89573f..40bdeea8e9429de241b045252c8c286ffd618c57 100644
--- a/Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
+++ b/Golden_Repo/g/gnuplot/gnuplot-5.4.2-GCCcore-11.2.0.eb
@@ -29,6 +29,7 @@ dependencies = [
     ('libcerf', '1.17'),
     ('X11', '20210802'),
     ('Qt5', '5.15.2'),
+    ('libreadline', '8.1'),
 ]
 
 preconfigopts = 'autoreconf && '
diff --git a/Golden_Repo/h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb b/Golden_Repo/h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..883edc6a10b60ebc1a9bfaf73a595c920e411822
--- /dev/null
+++ b/Golden_Repo/h/HDFView/HDFView-3.1.3-GCCcore-11.2.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'Binary'
+
+name = 'HDFView'
+version = '3.1.3'
+
+homepage = 'https://www.hdfgroup.org/downloads/hdfview/'
+description = "HDFView is a visual tool for browsing and editing HDF4 and HDF5 files."
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-%(version)s/bin/']
+sources = ['HDFViewApp-%(version)s-centos8_64.tar.gz']
+checksums = ['e60976ba816afc426bc3bc7a151b6f2e208605711e9bc9bf188ef14771faa4c7']
+
+dependencies = [
+    ('Java', '15', '', SYSTEM)
+]
+
+install_cmd = "tar xfvz *.tar.gz && "
+install_cmd += "mkdir %(installdir)s/lib && mkdir %(installdir)s/bin && "
+install_cmd += "cp -a HDFView/lib/app %(installdir)s/lib && "
+install_cmd += "cp -a HDFView/lib/app/hdfview.sh %(installdir)s/bin/HDFView && "
+install_cmd += 'sed -i "s@export JAVABIN=.*@export JAVABIN=$EBROOTJAVA/bin@g" %(installdir)s/bin/HDFView && '
+install_cmd += 'sed -i "s@export INSTALLDIR=.*@export INSTALLDIR=%(installdir)s@g" %(installdir)s/bin/HDFView'
+
+sanity_check_paths = {
+    'files': ['bin/HDFView'],
+    'dirs': ['lib/app'],
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/hidden_deps.txt b/Golden_Repo/hidden_deps.txt
index 8524e463371471def30a14173aa3e73ff4fc8b67..04bc95af051c8bcb5b0a1449f3b26930fee6d411 100644
--- a/Golden_Repo/hidden_deps.txt
+++ b/Golden_Repo/hidden_deps.txt
@@ -31,6 +31,7 @@ GLPK
 GLib
 GObject-Introspection
 GPC
+GStreamer
 GTI
 GTK+
 GTS
diff --git a/Golden_Repo/i/IRkernel/IRkernel-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.2.1.eb b/Golden_Repo/i/IRkernel/IRkernel-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cba7f9ea5ae52c7733b84013f1636c86a3305b2d
--- /dev/null
+++ b/Golden_Repo/i/IRkernel/IRkernel-1.3-gcccoremkl-11.2.0-2021.4.0-R-4.2.1.eb
@@ -0,0 +1,51 @@
+easyblock = 'Bundle'
+
+name = 'IRkernel'
+version = '1.3'
+versionsuffix = '-R-%(rver)s'
+
+homepage = 'https://github.com/baktoft/yaps'
+description = "IRKernel"
+
+toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
+
+dependencies = [
+    ('R', '4.1.2'),
+    ('ZeroMQ', '4.3.4'),  # for pbdZMQ needed by IRkernel
+]
+
+exts_default_options = {
+    'source_urls': [
+        'https://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
+        'https://cran.r-project.org/src/contrib/',  # current version of packages
+        'https://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    ],
+    'source_tmpl': '%(name)s_%(version)s.tar.gz'
+}
+
+exts_defaultclass = 'RPackage'
+exts_filter = ("R -q --no-save", "library(%(ext_name)s)")
+
+exts_list = [
+    ('repr', '1.1.4', {
+        'checksums': ['6f799ca83e0940618dd8c22e62ffdce5ec11ba3366c5306ae58b55b53c097040'],
+    }),
+    ('IRdisplay', '1.1', {
+        'checksums': ['83eb030ff91f546cb647899f8aa3f5dc9fe163a89a981696447ea49cc98e8d2b'],
+    }),
+    ('pbdZMQ', '0.3-7', {
+        'checksums': ['df2d2be14b2f57a64d76cdda4c01fd1c3d9aa12221c63524c01c71849df11808'],
+    }),
+    (name, version, {
+        'checksums': ['5a7fcbfd978dfb3cca6702a68a21c147551995fc400084ae8382ffcbbdae1903'],
+    }),
+]
+
+modextrapaths = {'R_LIBS': ''}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': [name],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2-nompi.eb b/Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2.0-nompi.eb
similarity index 100%
rename from Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2-nompi.eb
rename to Golden_Repo/i/ITK/ITK-5.2.1-GCCcore-11.2.0-nompi.eb
diff --git a/Golden_Repo/j/jsc-xdg-menu/jsc-xdg-menu-2022.3-GCCcore-11.2.0.eb b/Golden_Repo/j/jsc-xdg-menu/jsc-xdg-menu-2022.3-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..20dcfa0a4ed47bfa23f943cf53390402e738a232
--- /dev/null
+++ b/Golden_Repo/j/jsc-xdg-menu/jsc-xdg-menu-2022.3-GCCcore-11.2.0.eb
@@ -0,0 +1,40 @@
+easyblock = 'Binary'
+
+name = 'jsc-xdg-menu'
+version = '2022.3'
+
+homepage = ''
+description = """setup JSC`s desktop menu"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://gitlab.version.fz-juelich.de/goebbert1/jsc-xdg-menu/-/archive/%(version)s/']
+sources = ['%(name)s-%(version)s.tar.gz']
+checksums = ['5ab2891051085799f1043a4e0232d2ea7875c0cafcb86cc1eab0889857b7b49f']
+
+builddependencies = [
+    # just ensure they exist
+    ('Blender', '2.93.5', '-binary', SYSTEM),
+    ('CubeGUI', '4.6'),
+    ('GPicView', '0.2.5'),
+    ('HDFView', '3.1.3'),
+    ('Nsight-Compute', '2022.1.0'),
+    ('Nsight-Systems', '2022.1.1'),
+    # ('ParaView', '5.10.0', '', ('gpsmkl', '2021')),
+    ('TotalView', '2021.4.10'),
+    ('Vampir', '10.0.0', '', SYSTEM),
+]
+
+extract_sources = True,
+install_cmd = 'cp -a %(builddir)s/%(name)s-%(version)s/* %(installdir)s/'
+
+modextravars = {'XDG_MENU_PREFIX': 'jsc-'}
+modextrapaths = {'XDG_CONFIG_DIRS': 'config',
+                 'XDG_DATA_DIRS': 'data'}
+
+sanity_check_paths = {
+    'files': ['README.md', 'config/menus/jsc-applications.menu'],
+    'dirs': ['bin', 'config/menus', 'data/applications', 'data/desktop-directories'],
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb b/Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb
index 81d0e8fb36b1074087d53a78ea17b2e1ae04c718..479b36b9fb077cc9f76fdda6334b4a30399aa150 100644
--- a/Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb
+++ b/Golden_Repo/l/libffi/libffi-3.4.2-GCCcore-11.2.0.eb
@@ -19,6 +19,9 @@ builddependencies = [
     ('binutils', '2.37'),
 ]
 
+# work-around for https://github.com/libffi/libffi/pull/647
+configopts = '--disable-exec-static-tramp '
+
 sanity_check_paths = {
     'files': ['lib/libffi.a', 'lib/libffi.%s' % SHLIB_EXT],
     'dirs': ['include', 'share'],
diff --git a/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb b/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
index 7690e9e8a2c355d80bfd39996bc03618e99621df..1295f111648eeca3dbcc19162f66febe709bf60c 100644
--- a/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
+++ b/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
@@ -21,7 +21,10 @@ builddependencies = [
     ('NASM', '2.15.05'),
 ]
 
-configopts = '--enable-pic --enable-shared'
+
+configopts = '--enable-pic --enable-shared '
+# https://github.com/Xpra-org/xpra/issues/3082
+configopts += '--enable-vp9-highbitdepth'
 
 sanity_check_paths = {
     # 'lib/libvpx.%s' % SHLIB_EXT],
diff --git a/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb b/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
index 173da2ccd4471061a18f5664cc6c701b83baa247..69aed046c66b1053da0ecdb5e03b29290f5bc636 100644
--- a/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
+++ b/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
@@ -18,7 +18,8 @@ sources = [
         'download_filename': 'eb6e7bb63738e29efd82ea3cf2a115238a89fa51.tar.gz',
     }
 ]
-checksums = ['92f70cbd168aaaabad33f59221013e6cee8e41aa802db592b027e4e01e0bcbba']
+# checksum changes with every download
+checksums = ['df3300c3c9d56b5d6b0ef02f330ca508ef4428b1b9af67083201004deb93991a']
 
 builddependencies = [
     ('binutils', '2.37'),
@@ -28,14 +29,12 @@ builddependencies = [
 separate_build_dir = True
 start_dir = './'
 
-maxparallel = 12
-
 configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
 
 postinstallcmds = [
     (
         '{ cat >> %(installdir)s/libyuv.pc; } << \'EOF\'\n'
-        'prefix=PREFIX_TEMPLATE\n'
+        'prefix=%(installdir)s\n'
         'exec_prefix=${prefix}\n'
         'libdir=${prefix}/lib\n'
         'includedir=${prefix}/include\n'
@@ -43,7 +42,8 @@ postinstallcmds = [
         'Name: libyuv\n'
         'Description: YUV conversion and scaling functionality library\n'
         'Version: 0\n'
-        'Libs: -lyuv\n'
+        'Cflags: -I${includedir}\n'
+        'Libs: -L${libdir} -lyuv\n'
         'EOF'
     ),
 ]
diff --git a/Golden_Repo/m/MCR/MCR-R2021b.2.eb b/Golden_Repo/m/MCR/MCR-R2021b.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b7e3e831019e4c19f3e5c62cf55a70f34f081f9e
--- /dev/null
+++ b/Golden_Repo/m/MCR/MCR-R2021b.2.eb
@@ -0,0 +1,21 @@
+##
+# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
+##
+name = 'MCR'
+version = 'R2021b'  # runtime version 9.11
+local_update = '2'
+versionsuffix = '.%s' % local_update
+
+homepage = 'https://www.mathworks.com/products/compiler/mcr/'
+description = """The MATLAB Runtime is a standalone set of shared libraries
+ that enables the execution of compiled MATLAB applications
+ or components on computers that do not have MATLAB installed."""
+
+toolchain = SYSTEM
+
+source_urls = ['https://ssd.mathworks.com/supportfiles/downloads/%%(version)s/Release/%s/deployment_files/'
+               'installer/complete/glnxa64/' % local_update]
+sources = ['MATLAB_Runtime_%%(version)s_Update_%s_glnxa64.zip' % local_update]
+checksums = ['731ea5ff34a64ec05024ccf36dc24cfb77d5de4dfabec678e3b964e1110aa6e2']
+
+moduleclass = 'math'
diff --git a/Golden_Repo/m/MCR/MCR-R2022a.eb b/Golden_Repo/m/MCR/MCR-R2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4e33dcd257c9504f8d1a28e32957b1ada4573ec
--- /dev/null
+++ b/Golden_Repo/m/MCR/MCR-R2022a.eb
@@ -0,0 +1,20 @@
+##
+# Author:    Robert Mijakovic <robert.mijakovic@lxp.lu>
+##
+name = 'MCR'
+version = 'R2022a'  # runtime version 9.12
+local_update = '0'
+
+homepage = 'https://www.mathworks.com/products/compiler/mcr/'
+description = """The MATLAB Runtime is a standalone set of shared libraries
+ that enables the execution of compiled MATLAB applications
+ or components on computers that do not have MATLAB installed."""
+
+toolchain = SYSTEM
+
+source_urls = ['https://ssd.mathworks.com/supportfiles/downloads/%%(version)s/Release/%s/deployment_files/'
+               'installer/complete/glnxa64/' % local_update]
+sources = ['MATLAB_Runtime_%(version)s_glnxa64.zip']
+checksums = ['ce013fa6d46148741ad55abaddd26d8d85d6fa4cf94917c8f3a66f350230cfc7']
+
+moduleclass = 'math'
diff --git a/Golden_Repo/n/NCCL/NCCL-2.12-7-1-GCCcore-11.2.0-CUDA-11.5.eb b/Golden_Repo/n/NCCL/NCCL-2.12-7-1-GCCcore-11.2.0-CUDA-11.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..07d51a9e9d67dd5fe9f5b929ebaa59771b7ba660
--- /dev/null
+++ b/Golden_Repo/n/NCCL/NCCL-2.12-7-1-GCCcore-11.2.0-CUDA-11.5.eb
@@ -0,0 +1,30 @@
+name = 'NCCL'
+version = '2.12.7-1'
+versionsuffix = '-CUDA-%(cudaver)s'
+
+homepage = 'https://developer.nvidia.com/nccl'
+description = """The NVIDIA Collective Communications Library (NCCL) implements multi-GPU and multi-node collective
+communication primitives that are performance optimized for NVIDIA GPUs."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+github_account = 'NVIDIA'
+sources = [{
+    'filename': '%(name)s-%(version)s.tar.gz',
+    'git_config': {
+        'url': 'https://github.com/NVIDIA/',
+        'repo_name': 'nccl',
+        'tag': 'v%(version)s',
+        'recursive': True,
+    },
+}]
+checksums = ['277bc85e1b4fa5550aa3371065fb14be62393e6c3df41f0382008b05bb93a7e4']
+
+builddependencies = [('binutils', '2.37')]
+
+dependencies = [
+    ('CUDA', '11.5', '', True),
+    ('UCX', '1.11.2', '', SYSTEM),
+]
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/o/OpenCV/OpenCV-4.5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb b/Golden_Repo/o/OpenCV/OpenCV-4.5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9d783c79c2073837961d26805a4c9d3ea1dbd68e
--- /dev/null
+++ b/Golden_Repo/o/OpenCV/OpenCV-4.5.5-gcccoremkl-11.2.0-2021.4.0-contrib.eb
@@ -0,0 +1,139 @@
+easyblock = 'CMakeMake'
+
+name = 'OpenCV'
+version = '4.5.5'
+versionsuffix = '-contrib'
+
+# the hash is version dependent! see 3rdparty/ippicv/ippicv.cmake
+local_ippicv_hash = 'a56b6ac6f030c312b2dce17430eef13aed9af274'
+
+homepage = 'https://opencv.org/'
+description = """OpenCV (Open Source Computer Vision Library) is an open source computer vision
+ and machine learning software library. OpenCV was built to provide
+ a common infrastructure for computer vision applications and to accelerate
+ the use of machine perception in the commercial products.
+ Includes extra modules for OpenCV from the contrib repository."""
+
+toolchain = {'name': 'gcccoremkl', 'version': '11.2.0-2021.4.0'}
+toolchainopts = {'pic': True, 'optarch': True}
+
+sources = [
+    {'source_urls': ['https://github.com/opencv/opencv/archive/'],
+     'download_filename': '%(version)s.zip', 'filename': SOURCELOWER_ZIP},
+    {'source_urls': ['https://github.com/opencv/opencv_contrib/archive/'],
+     'download_filename': '%(version)s.zip', 'filename': '%(namelower)s_contrib-%(version)s.zip'},
+    {'source_urls': ['https://raw.githubusercontent.com/opencv/opencv_3rdparty/%s/ippicv' % local_ippicv_hash],
+     'filename': 'ippicv_2020_lnx_intel64_20191018_general.tgz', 'extract_cmd': "cp %s %(builddir)s"},
+]
+checksums = [
+    'fb16b734db3a28e5119d513bd7c61ef417edf3756165dc6259519bb9d23d04e2',  # opencv-4.5.5.zip
+    'f53a0e531b2e284d2d1af013f5d96a86dfc1165d71eb47ddc9e7b834cc803091',  # opencv_contrib-4.5.5.zip
+    '08627fa5660d52d59309a572dd7db5b9c8aea234cfa5aee0942a1dd903554246',  # ippicv_2020_lnx_intel64_20191018_general.tgz
+]
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1', '', SYSTEM),
+]
+
+dependencies = [
+    ('Python', '3.9.6'),
+    ('SciPy-bundle', '2021.10'),  # for numpy
+    ('zlib', '1.2.11'),
+    ('FFmpeg', '4.4.1'),
+    ('GStreamer', '1.18.6'),
+    ('freetype', '2.11.0'),
+    ('HarfBuzz', '2.8.2'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('LibTIFF', '4.3.0'),
+    ('libwebp', '1.2.0'),
+    ('OpenEXR', '3.1.1'),
+    ('JasPer', '2.0.33'),
+    ('Java', '15', '', True),
+    ('ant', '1.10.12', '-Java-%(javaver)s', True),
+    ('GLib', '2.69.1'),
+    ('GTK+', '3.24.23',),
+    ('HDF5', '1.12.1', '-serial'),  # needed by hdf from contrib
+    ('protobuf', '3.17.3'),
+    ('Eigen', '3.3.9'),
+    ('CUDA', '11.5', '', SYSTEM),
+    ('cuDNN', '8.3.1.22', '-CUDA-11.5', SYSTEM),
+    ('nvidia-Video_Codec_SDK', '11.1.5', '', SYSTEM),
+    ('OpenGL', '2021b'),
+]
+
+separate_build_dir = True
+
+configopts = "-D CMAKE_BUILD_TYPE=RELEASE "
+configopts += '-D CMAKE_CXX_FLAGS="-Wdeprecated-declarations" '
+
+configopts += "-D OPENCV_GENERATE_PKGCONFIG=ON "
+configopts += "-D ENABLE_PRECOMPILED_HEADERS=OFF "
+
+configopts += "-D BUILD_EXAMPLES=ON "
+configopts += "-D INSTALL_PYTHON_EXAMPLES=ON "
+
+# configopts += "-D ENABLE_FAST_MATH=ON "
+# configopts += "-D CUDA_FAST_MATH=ON "
+
+configopts += "-D WITH_CUDA=ON "
+configopts += "-D WITH_CUDNN=ON "
+configopts += "-D WITH_CUBLAS=ON "
+configopts += "-D WITH_CUFFT=ON "
+configopts += "-D CUDA_ARCH_BIN='%(cuda_cc_space_sep)s' "
+# configopts += "-D CUDA_ARCH_PTX='' "
+configopts += "-D BUILD_CUDA_STUBS=ON "
+configopts += "-D OPENCV_DNN_CUDA=ON "
+configopts += "-D BUILD_opencv_cudacodec=ON "
+
+configopts += "-D WITH_NVCUVID=ON "
+
+configopts += "-D WITH_GSTREAMER=ON "
+
+configopts += '-DOPENCV_EXTRA_MODULES_PATH=%(builddir)s/%(namelower)s_contrib-%(version)s/modules '
+
+configopts += "-DProtobuf_INCLUDE_DIR=$EBROOTPROTOBUF/include "
+configopts += "-DProtobuf_LIBRARY=$EBROOTPROTOBUF/lib64/libprotobuf.so "
+configopts += "-DProtobuf_LITE_LIBRARY_RELEASE=$EBROOTPROTOBUF/lib64/libprotobuf-lite.so "
+configopts += "-DProtobuf_PROTOC_LIBRARY_RELEASE=$EBROOTPROTOBUF/lib64/bprotoc.so "
+configopts += "-DBUILD_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=ON "
+
+# XXXX in configurations is a bug fix in OpenCV because ocv_check_modules is not able to recognize freetype and harfbuzz
+# ref: https://github.com/opencv/opencv/blob/6e8daaec0f46aaba9ea22e2afce47307b1dbff9f/cmake/OpenCVUtils.cmake#L861
+
+configopts += '-DFREETYPE_FOUND=ON '
+configopts += '-DFREETYPE_INCLUDE_DIRS=$EBROOTFREETYPE/include/freetype2/ '
+configopts += '-DFREETYPE_LIBRARIES=$EBROOTFREETYPE/lib64/libfreetype.so '
+configopts += '-DFREETYPE_LINK_LIBRARIES=$EBROOTFREETYPE/lib64/libfreetype.so '
+configopts += '-DFREETYPE_LINK_LIBRARIES_XXXXX=ON '
+
+configopts += '-DHARFBUZZ_FOUND=ON '
+configopts += '-DHARFBUZZ_INCLUDE_DIRS=$EBROOTHARFBUZZ/include/harfbuzz '
+configopts += '-DHARFBUZZ_LIBRARIES=$EBROOTHARFBUZZ/lib64/libharfbuzz.so '
+configopts += '-DHARFBUZZ_LINK_LIBRARIES=$EBROOTHARFBUZZ/lib64/libharfbuzz.so '
+configopts += '-DHARFBUZZ_LINK_LIBRARIES_XXXXX=ON '
+
+configopts += "-D PYTHON_DEFAULT_EXECUTABLE=$EBROOTPYTHON/bin/python3 "
+configopts += "-D PYTHON2_EXECUTABLE='' "  # ensure python2 is NOT used
+configopts += '-DBUILD_opencv_python2=OFF '
+
+configopts += "-D WITH_OPENMP=ON "
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages/'}
+
+enhance_sanity_check = True
+
+local_contrib_libs = [
+    'aruco', 'bgsegm', 'bioinspired', 'ccalib', 'datasets', 'dnn_objdetect', 'dnn_superres', 'dpm', 'face', 'freetype',
+    'fuzzy', 'hdf', 'hfs', 'img_hash', 'line_descriptor', 'optflow', 'phase_unwrapping', 'plot', 'quality', 'reg',
+    'rgbd', 'saliency', 'shape', 'stereo', 'structured_light', 'superres', 'surface_matching', 'text', 'tracking',
+    'videostab', 'xfeatures2d', 'ximgproc', 'xobjdetect', 'xphoto'
+]
+
+sanity_check_paths = {
+    'files': ['lib64/libopencv_%s.%s' % (l, SHLIB_EXT) for l in local_contrib_libs],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb b/Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb
index a5fc244563d8694a82b4289ffe2ac99672858a78..7033ab568a3df8a1a791868230b575c5218f6296 100644
--- a/Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb
+++ b/Golden_Repo/p/PyGObject/PyGObject-3.42.0-GCCcore-11.2.0.eb
@@ -27,15 +27,12 @@ dependencies = [
     ('libffi', '3.4.2'),
 ]
 
-use_pip = True
+use_pip = False
 sanity_pip_check = True
 download_dep_fail = True
 
-# remove pyproject.toml, which causes trouble (header files and .pc file are not installed)
-preinstallopts = "rm pyproject.toml && "
-
-# Don't build a wheel or the pkg-cfg file won't be installed
-installopts = '--no-binary=%(namelower)s'
+# install data (pkg-config and include files)
+installopts = '--root=/'
 
 sanity_check_paths = {
     'files': [
diff --git a/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb b/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb
index 69726a65d73e316d0115eba02e56fb7e8b9ed4b6..1bc3b4a15d72d192e6e3d748f27f3950d8c58fe2 100644
--- a/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb
+++ b/Golden_Repo/p/Python/Python-3.9.6-GCCcore-11.2.0.eb
@@ -727,11 +727,6 @@ postinstallcmds = [
 
 buildopts = "PROFILE_TASK='-m test --pgo -x test_socket'"
 
-# Needed so stuff here is picked up in virtual environments (like in the Jupyter easyconfig)
-modextrapaths = {
-    'PYTHONPATH': 'lib/python%s/site-packages' % ".".join(version.split(".")[:-1])
-}
-
 modextravars = {
     'PIP_CONFIG_FILE': '%(installdir)s/etc/pip.conf'
 }
diff --git a/Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb b/Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb
index d06c0333e33796b25189e4a9e1a845006c464dc6..9ace71cebc79d2adcbed11d77ebd478c24405037 100644
--- a/Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb
+++ b/Golden_Repo/r/Ruby/Ruby-3.0.1-GCCcore-11.2.0.eb
@@ -28,20 +28,20 @@ exts_default_options = {
 # each version is picked as high as possible to fullfill all requirements
 # packages updated on 2021-07-02
 exts_list = [
-    ('ffi', '1.15.3', {
-        'checksums': ['98d5c5c4281c9c0466acc60cf0e79124bf3c311417fd97e7473e41722953fbf1'],
+    ('ffi', '1.15.5', {
+        'checksums': ['6f2ed2fa68047962d6072b964420cba91d82ce6fa8ee251950c17fca6af3c2a0'],
     }),
     ('childprocess', '4.1.0', {
         'checksums': ['3616ce99ccb242361ce7f2b19bf9ff3e6bc1d98b927c7edc29af8ca617ba6cd3'],
     }),
-    ('json', '2.5.1', {
-        'checksums': ['918d8c41dacb7cfdbe0c7bbd6014a5372f0cf1c454ca150e9f4010fe80cc3153'],
+    ('json', '2.6.1', {
+        'checksums': ['7ff682a2db805d6b924e4e87341c3c0036824713a23c58ca53267ce7e5ce2ffd'],
     }),
     ('cabin', '0.9.0', {
         'checksums': ['91c5394289e993e7037a6c869e3f212f31a5984d2b1811ac934f591c87446b2c'],
     }),
-    ('backports', '3.21.0', {
-        'checksums': ['f9394457cb1dd5ca1b7bdc0dfbbd8f56f5cde40f45f96bc90f0f895a87e41b77'],
+    ('backports', '3.23.0', {
+        'checksums': ['88fc26a40083a51015faa2ba02cbdc3605cb59f183cf0868f4fb3ac02900148f'],
     }),
     ('arr-pm', '0.0.11', {
         'checksums': ['f1ab088421276f446da1971c5071defd1504855ec46e196815fa43cd62d61a9f'],
@@ -52,17 +52,17 @@ exts_list = [
     ('multipart-post', '2.1.1', {
         'checksums': ['d2dd7aa957650e0d99e0513cd388401b069f09528441b87d884609c8e94ffcfd'],
     }),
-    ('ruby2_keywords', '0.0.4', {
-        'checksums': ['3ae3189c2e1d2f60204dcceedf890ff49dd28979771e2576016a3ee73b668e97'],
+    ('ruby2_keywords', '0.0.5', {
+        'checksums': ['ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef'],
     }),
-    ('faraday-net_http', '1.0.1', {
-        'checksums': ['3245ce406ebb77b40e17a77bfa66191dda04be2fd4e13a78d8a4305854d328ba'],
+    ('faraday-net_http', '2.0.1', {
+        'checksums': ['f867b028552c3cf018b9293b58b993dc238ba62683568b3e194c673afe62d700'],
     }),
-    ('faraday', '1.3.0', {
-        'checksums': ['7f06817ba823ddeabf4dd85ca5e0f63e234527f564a03f09f6c7127951d3bac2'],
+    ('faraday', '1.0.0', {
+        'checksums': ['e67631809ae5633a1d2b03adfa83939a91a095f6dc61a1f322826612613dd687'],
     }),
-    ('faraday_middleware', '1.0.0', {
-        'checksums': ['19e808539681bbf2e65df30dfbe27bb402bde916a1dceb4c7496dbe8de14334a'],
+    ('faraday_middleware', '1.2.0', {
+        'checksums': ['ded15d574d50e92bd04448d5566913af5cb1a01b2fa311ceecc2464fa0ab88af'],
     }),
     ('highline', '2.0.3', {
         'checksums': ['2ddd5c127d4692721486f91737307236fe005352d12a4202e26c48614f719479'],
@@ -82,17 +82,17 @@ exts_list = [
     ('public_suffix', '4.0.6', {
         'checksums': ['a99967c7b2d1d2eb00e1142e60de06a1a6471e82af574b330e9af375e87c0cf7'],
     }),
-    ('addressable', '2.7.0', {
-        'checksums': ['5e9b62fe1239091ea9b2893cd00ffe1bcbdd9371f4e1d35fac595c98c5856cbb'],
+    ('addressable', '2.8.0', {
+        'checksums': ['f76d29d2d1f54b6c6a49aec58f9583b08d97e088c227a3fcba92f6c6531d5908'],
     }),
     ('concurrent-ruby', '1.1.9', {
         'checksums': ['0ec0846d991c38f355b4228ad8ea77aa69c3fdaa320cd574dafedc10c4688a5b'],
     }),
-    ('i18n', '1.8.10', {
-        'checksums': ['ca24e52fdd6ad7af419241eef8c41e65ef4e3499c6b252df13f697919eb24e3c'],
+    ('i18n', '1.8.11', {
+        'checksums': ['ae133354590b49070b87c83f8fe8cc064ffdc40ca76364535e100312e30cad6d'],
     }),
-    ('minitest', '5.14.4', {
-        'checksums': ['f4716634d71b3ffb627cd63ba4f6f0f77c7a3f17353b1bdf52c8a7f2e0e4e7a7'],
+    ('minitest', '5.15.0', {
+        'checksums': ['6d2d5bfa301257ef2c2fe8818abeaa0932ed54735c8ed039459cb4f85029ae1b'],
     }),
     ('thread_safe', '0.3.6', {
         'checksums': ['9ed7072821b51c57e8d6b7011a8e282e25aeea3a4065eab326e43f66f063b05a'],
@@ -100,11 +100,11 @@ exts_list = [
     ('tzinfo', '1.1.0', {
         'checksums': ['715a47c25f8e4c2f106c92d5a97e612f84eb7e85f5822bf3d6cf615b44492abc'],
     }),
-    ('zeitwerk', '2.4.2', {
-        'checksums': ['f4d6279b0ef0cb35c9e1bddbcecd6b148df82f1cf7b8023ac03d6625f567869c'],
+    ('zeitwerk', '2.5.3', {
+        'checksums': ['ddfeb36d24444b10f402cae2ee5a05c580f54115ae25bcf2ac29bf814c4faf52'],
     }),
-    ('activesupport', '5.0.7.2', {
-        'checksums': ['f75cc67fb08421bdf4c2a383a47d9b3b02ce5eec4749704b1286fb0c12c98bad'],
+    ('activesupport', '5.2.6', {
+        'checksums': ['7249ee13859fc99ed2c833048674fd28c11605c679f1c65035190a2219e9cbef'],
     }),
     ('gh', '0.18.0', {
         'checksums': ['eb93f18a88db3ba92eb888610fc53fae731d9dacfe55922b58cc3f3aca776a47'],
@@ -112,8 +112,8 @@ exts_list = [
     ('launchy', '2.5.0', {
         'checksums': ['954243c4255920982ce682f89a42e76372dba94770bf09c23a523e204bdebef5'],
     }),
-    ('ethon', '0.14.0', {
-        'checksums': ['10e267a39d7e2a92d944e5681ba46dbd211b5b5b6cf9b51afb769b8417247ead'],
+    ('ethon', '0.15.0', {
+        'checksums': ['0809805a035bc10f54162ca99f15ded49e428e0488bcfe1c08c821e18261a74d'],
     }),
     ('typhoeus', '1.4.0', {
         'checksums': ['fff9880d5dc35950e7706cf132fd297f377c049101794be1cf01c95567f642d4'],
@@ -124,11 +124,11 @@ exts_list = [
     ('pusher-client', '0.6.2', {
         'checksums': ['c405c931090e126c056d99f6b69a01b1bcb6cbfdde02389c93e7d547c6efd5a3'],
     }),
-    ('diff-lcs', '1.4.4', {
-        'checksums': ['bf3a658875f70c1467fe7a3b302b795f074c84b28db6e4a2bd6b1ad6d12a2255'],
+    ('diff-lcs', '1.5.0', {
+        'checksums': ['49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67'],
     }),
-    ('rspec-support', '3.10.2', {
-        'checksums': ['74315f89069fbaf2a710e2117340373b77ee45eceb026de87e0cad9dd5154596'],
+    ('rspec-support', '3.10.3', {
+        'checksums': ['65c88f8cbe579461f411097682e6402960eae327eef08e86ef581b8c609e4c5e'],
     }),
     ('rspec-mocks', '3.10.2', {
         'checksums': ['93fc76e312c3d19cacc1cb2eb64bf82731de2e216295cf2b4d0ce31ba77923b4'],
@@ -160,27 +160,27 @@ exts_list = [
     ('rack-test', '1.1.0', {
         'checksums': ['154161f40f162b1c009a655b7b0c5de3a3102cc6d7d2e94b64e1f46ace800866'],
     }),
-    ('bundler', '2.2.21', {
-        'checksums': ['3c8dc5e0cf66d385a9b33751e54986290d42023c5e1bba2b5df094917b6e234a'],
+    ('bundler', '2.3.5', {
+        'checksums': ['2553cbd138b466bc56a3c724c5c28648dff8e2343b13a7c696cf9c2818c8d629'],
     }),
     # for Jupyter kernel
-    ('mime-types-data', '3.2021.0704', {
-        'checksums': ['9ecd5aa031d5483156cd7a4e7d1956881d75f7ed8c08d487900df8580ee39d36'],
+    ('mime-types-data', '3.2022.0105', {
+        'checksums': ['d8c401ba9ea8b648b7145b90081789ec714e91fd625d82c5040079c5ea696f00'],
     }),
-    ('mime-types', '3.3.1', {
-        'checksums': ['708f737e28ceef48b9a1bc041aa9eec46fa36eb36acb95e6b64a9889131541fe'],
+    ('mime-types', '3.4.1', {
+        'checksums': ['6bcf8b0e656b6ae9977bdc1351ef211d0383252d2f759a59ef4bcf254542fc46'],
     }),
     ('data_uri', '0.1.0', {
         'checksums': ['7eb2f63487ccb943fae0eca561729c48d4d5654d76f8330aa16ed1dcdbebf33b'],
     }),
-    ('io-console', '0.5.9', {
-        'checksums': ['4aaefa9e601433071a92a4761a9f0ceb6507975d31ac75a6bd2a7c043b77aa5e'],
+    ('io-console', '0.5.11', {
+        'checksums': ['7e2418376fd185ad66e7aee2c58c207e9be0f2197aa89bc4c89931995cee3365'],
     }),
-    ('reline', '0.2.6', {
-        'checksums': ['ea2f3c3209feb17594dbd33242719fa24ca0fd29a63a1b49d2a6035e265a5183'],
+    ('reline', '0.3.1', {
+        'checksums': ['b101d93607bf7564657f082f68abfa19ae939d14a709eff89be048eae2d7f4c7'],
     }),
-    ('irb', '1.3.6', {
-        'checksums': ['79c73e1cada8aee635a07a0dbb443fc6bfac357903d277476505d8700b949e68'],
+    ('irb', '1.4.1', {
+        'checksums': ['4a6698d9ab9de30ffd2def6fb17327f5d0fc089ace62337eff95396f379bf0a8'],
     }),
     ('multi_json', '1.15.0', {
         'checksums': ['1fd04138b6e4a90017e8d1b804c039031399866ff3fbabb7822aea367c78615d'],
@@ -191,8 +191,11 @@ exts_list = [
     ('ffi-rzmq', '2.0.7', {
         'checksums': ['2feb3bc5bf46df633e2211514ac408521df0c198f54134fdb38322675d9f4591'],
     }),
-    ('iruby', '0.7.3', {
-        'checksums': ['04d49dc6024168b67ab29a2458eae3e567756223a1e5eeb285b8ecfaad6e8fc3'],
+    ('native-package-installer', '1.1.3', {
+        'checksums': ['ba899df70489b748a3fe1b48afe6325d1cb8ca67fdff759266c275b911c797dd'],
+    }),
+    ('iruby', '0.7.4', {
+        'checksums': ['cc219e2ac797c3fbf8c2b937ee7d26547723c8ae0e5ad65f2975aa3325b3a620'],
     }),
 ]
 
diff --git a/Golden_Repo/s/Siesta/Siesta-4.1.5-gpsmkl-2021b.eb b/Golden_Repo/s/Siesta/Siesta-4.1.5-gpsmkl-2021b.eb
deleted file mode 100644
index 66ef9515e593c2ed3ae9c76fc29f9586ee092d08..0000000000000000000000000000000000000000
--- a/Golden_Repo/s/Siesta/Siesta-4.1.5-gpsmkl-2021b.eb
+++ /dev/null
@@ -1,31 +0,0 @@
-name = 'Siesta'
-version = '4.1.5'
-
-homepage = 'http://departments.icmab.es/leem/siesta'
-description = """SIESTA is both a method and its computer program implementation, to perform efficient electronic
- structure calculations and ab initio molecular dynamics simulations of molecules and solids."""
-
-toolchain = {'name': 'gpsmkl', 'version': '2021b'}
-toolchainopts = {'usempi': True, 'precise': True}
-
-source_urls = [
-    'https://gitlab.com/siesta-project/siesta/-/releases/v%(version)s/downloads']
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['518df31aa6213af5e24cc73abb537b2c89a925b487171f5339d743d0c7140b3f']
-
-dependencies = [
-    ('netCDF-Fortran', '4.5.3'),
-    ('METIS', '5.1.0'),
-    ('ELPA', '2021.11.001'),
-]
-
-# Needed due to changes in GCC10.
-preconfigopts = 'export  FCFLAGS="-fallow-argument-mismatch $FCFLAGS" && '
-preconfigopts += 'export FFLAGS = "-fallow-argument-mismatch $FFLAGS" && '
-
-# transiesta is now siesta --electrode
-with_transiesta = False
-
-runtest = 'check'
-
-moduleclass = 'phys'
diff --git a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
similarity index 99%
rename from Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0.eb
rename to Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
index 8a10dcf8d8dd432e376259b41834d9a58f6e7828..20df01c8e923441191996ce21bcea1595881bc01 100644
--- a/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0.eb
+++ b/Golden_Repo/t/TensorFlow/TensorFlow-2.6.0-gcccoremkl-11.2.0-2021.4.0-CUDA-11.5.eb
@@ -97,6 +97,7 @@ exts_list = [
     }),
     ('tensorboard', version, {
         'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
+        # 'patches': ['tensorboard-2.6.0-jupyter.patch'],
         'checksums': ['f7dac4cdfb52d14c9e3f74585ce2aaf8e6203620a864e51faf84988b09f7bbdb'],
     }),
     ('tensorboard_plugin_wit', '1.8.0', {
diff --git a/Golden_Repo/t/TotalView/TotalView-2021-4.10-GCCcore-11.2.0.eb b/Golden_Repo/t/TotalView/TotalView-2021.4.10-GCCcore-11.2.0.eb
similarity index 96%
rename from Golden_Repo/t/TotalView/TotalView-2021-4.10-GCCcore-11.2.0.eb
rename to Golden_Repo/t/TotalView/TotalView-2021.4.10-GCCcore-11.2.0.eb
index be5d4ff83e070bb4664bbb414c49f854583b5239..d29655489ecde1d55b976e64a1def49e188558a2 100644
--- a/Golden_Repo/t/TotalView/TotalView-2021-4.10-GCCcore-11.2.0.eb
+++ b/Golden_Repo/t/TotalView/TotalView-2021.4.10-GCCcore-11.2.0.eb
@@ -52,8 +52,10 @@ sources = [
     '%(namelower)s.%(version)s-doc.tar',
 ]
 checksums = [
-    '7e5509b2cfb219100b0032304bdad7d422657c0736c386ba64bdb1bf11d10a1d',  # totalview_2021.4.10_linux_x86-64.tar
-    'c476288ebe1964e0803c7316975c71a957e52f45187b135bc1dc3b65491bb61d',  # totalview.2021.4.10-doc.tar
+    # totalview_2021.4.10_linux_x86-64.tar
+    '7e5509b2cfb219100b0032304bdad7d422657c0736c386ba64bdb1bf11d10a1d',
+    # totalview.2021.4.10-doc.tar
+    'c476288ebe1964e0803c7316975c71a957e52f45187b135bc1dc3b65491bb61d',
 ]
 
 sanity_check_paths = {
diff --git a/Golden_Repo/u/UCX/UCX-1.12.1.eb b/Golden_Repo/u/UCX/UCX-1.12.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70f33c6b2711e42b65c10aec4ddfa725696fbcad
--- /dev/null
+++ b/Golden_Repo/u/UCX/UCX-1.12.1.eb
@@ -0,0 +1,76 @@
+easyblock = 'ConfigureMake'
+
+name = 'UCX'
+version = '1.12.1'
+
+homepage = 'https://www.openucx.org/'
+description = """Unified Communication X
+An open-source production grade communication framework for data centric
+and high-performance applications
+"""
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+checksums = ['40b447c8e7da94a253f2828001b2d76021eb4ad39647107d433d62d61e18ae8e']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('Autotools', '20210726'),
+    ('pkg-config', '0.29.2'),
+]
+
+osdependencies = [OS_PKG_IBVERBS_DEV]
+
+dependencies = [
+    ('zlib', '1.2.11'),
+    ('numactl', '2.0.14'),
+    ('CUDA', '11.5'),
+]
+
+configopts = '--with-verbs '  # Build OpenFabrics support
+configopts += '--without-java '
+configopts += '--disable-doxygen-doc '
+
+# Enable machine-specific optimizations, default: NO
+configopts += '--enable-optimizations '
+# configopts += '--enable-tuning '       # Enable parameter tuning in run-time, default: NO
+# Enable thread support in UCP and UCT, default: NO
+configopts += '--enable-mt '
+configopts += '--disable-debug '
+configopts += '--disable-logging '
+configopts += '--disable-assertions '
+configopts += '--disable-params-check '
+configopts += '--disable-dependency-tracking '
+configopts += '--with-cuda=$EBROOTCUDA '
+
+configopts += '--enable-cma '           # Enable Cross Memory Attach
+
+# Compile with IB Reliable Connection support
+configopts += '--with-rc '
+# Compile with IB Unreliable Datagram support
+configopts += '--with-ud '
+# Compile with IB Dynamic Connection support
+configopts += '--with-dc '
+configopts += '--with-mlx5-dv '         # Compile with mlx5 Direct Verbs support
+configopts += '--with-ib-hw-tm '        # Compile with IB Tag Matching support
+configopts += '--with-dm '              # Compile with Device Memory support
+
+configopts += '--with-avx '             # Compile with AVX
+configopts += '--with-gdrcopy '         # Compile with GDRCopy
+
+# Compile without IB Connection Manager support
+configopts += '--without-cm '
+
+buildopts = 'V=1'
+
+sanity_check_paths = {
+    'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
+    'dirs': ['include', 'lib', 'share']
+}
+
+sanity_check_commands = ["ucx_info -d"]
+
+moduleclass = 'system'
diff --git a/Golden_Repo/x/xpra/xpra-4.3.1-GCCcore-11.2.0.eb b/Golden_Repo/x/xpra/xpra-4.3.2-GCCcore-11.2.0.eb
similarity index 75%
rename from Golden_Repo/x/xpra/xpra-4.3.1-GCCcore-11.2.0.eb
rename to Golden_Repo/x/xpra/xpra-4.3.2-GCCcore-11.2.0.eb
index 3fea4dff61129f13e6273a4204571949bf08a5ec..0cf74cbfd0963da9018069ce60ceea41fc4c5c40 100644
--- a/Golden_Repo/x/xpra/xpra-4.3.1-GCCcore-11.2.0.eb
+++ b/Golden_Repo/x/xpra/xpra-4.3.2-GCCcore-11.2.0.eb
@@ -1,7 +1,7 @@
 easyblock = 'Bundle'
 
 name = 'xpra'
-version = '4.3.1'
+version = '4.3.2'
 
 homepage = "http://www.xpra.org"
 description = """Xpra is an open-source multi-platform persistent remote display server and client
@@ -27,12 +27,14 @@ dependencies = [
     ('PyGObject', '3.42.0'),
     ('Pandoc', '2.16.1', '', SYSTEM),
     ('GTK+', '3.24.23'),
+    ('rencode', '1.0.5'),
     ('lz4', '1.9.3'),
     ('yuicompressor', '2.4.8'),
     ('x264', '20210613'),
     ('x265', '3.4'),
     ('libvpx', '1.11.0'),
     ('FFmpeg', '4.4.1'),
+    ('GStreamer', '1.18.6'),
     ('libwebp', '1.2.0'),
     ('libpng', '1.6.37'),
     ('libspng', '0.7.1'),
@@ -80,13 +82,23 @@ exts_list = [
         ('checksums', [('sha256', '99392b676c77b5795b86b7d75274db33fe754fd1e06fb3d58b167c797dc47f0c')]),
         ('modulename', 'uinput'),
     ])),
-    ('xpra', '4.3.1', dict(list(local_common_opts.items()) + [
+    ('ifaddr', '0.1.7', dict(list(local_common_opts.items()) + [
+        ('checksums', [('sha256', '1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94')]),
+    ])),
+    ('zeroconf', '0.38.4', dict(list(local_common_opts.items()) + [
+        ('checksums', [('sha256', '080c540ea4b8b9defa9f3ac05823c1725ea2c8aacda917bfc0193f6758b95aeb')]),
+    ])),
+    ('xpra', '4.3.2', dict(list(local_common_opts.items()) + [
         ('source_urls', ['https://github.com/Xpra-org/%(name)s/archive/']),
         ('source_tmpl', 'v%(version)s.tar.gz'),
-        ('patches', ['xpra-4.0.4-use_Xorg_on_PATH_first.patch']),
+        ('patches', [
+            'xpra-4.0.4-use_Xorg_on_PATH_first.patch',
+            'xpra-iconsearch-XDG_DATA_DIRS.patch',
+        ]),
         ('checksums', [
-            ('sha256', '1b90f68cc32a0b51d8bf09c92191b5c8b70ed98f0e9455c49e8a25d141de3660'),
+            ('sha256', '1e548b8d20c243fba40692abb0aa2759e3bd3f2d3b6b51a160f82746cdf1d782'),
             ('sha256', '83053938421de4dfd4ff8cd5430414180e9f33d5c59b4f1c1428095db6b1fa71'),
+            ('sha256', '7bb677302308dacdc55f9a862b6eee43f0a8d2b4524a8dec6d80bcdf3982d6af'),
         ]),
         ('use_pip', False),
         ('buildopts', '--without-strict --with-nvenc --with-nvjpeg --with-Xdummy'),
@@ -95,7 +107,11 @@ exts_list = [
     ('xpra-html5', '4.5.2', dict(list(local_common_opts.items()) + [
         ('source_urls', ['https://github.com/Xpra-org/%(name)s/archive/']),
         ('source_tmpl', 'v%(version)s.tar.gz'),
-        ('checksums', [('sha256', '7f4ccea864fdfb8d6c71a77100fcb2ad07af0773eaafc528ec19ff8187d9bfdb')]),
+        ('patches', ['xprahtml-4.5.2-encryptionfix.patch']),
+        ('checksums', [
+            ('sha256', '7f4ccea864fdfb8d6c71a77100fcb2ad07af0773eaafc528ec19ff8187d9bfdb'),
+            ('sha256', 'be0b430f7e6970eb35912c5c2cc7fb9f2073f94485c12776d06752cf8c0f6023'),
+        ]),
         ('use_pip', False),
         ('skipsteps', ['configure', 'build', 'install']),  # install in postinstallcmds
         ('modulename', 'xpra'),
@@ -109,6 +125,13 @@ postinstallcmds = [
         './setup.py install %(installdir)s/share/xpra/www && '
         'popd'
     ),
+    # set specific configurations
+    (
+        # server config
+        'touch %(installdir)s/etc/xpra/server.env && '
+        "sed -i 's!^source =.*!source = %(installdir)s/etc/xpra/server.env!' "
+        "       %(installdir)s/etc/xpra/conf.d/60_server.conf"
+    ),
     # make Xpra randomly choose a GPU for acceleration if present
     'mv %(installdir)s/bin/xpra %(installdir)s/bin/xpra.orig',
     'head -1 %(installdir)s/bin/xpra.orig > %(installdir)s/bin/xpra',
@@ -130,8 +153,12 @@ postinstallcmds = [
         'EOF'
     ),
     'tail -n +2 %(installdir)s/bin/xpra.orig >> %(installdir)s/bin/xpra',
+    'chmod +x %(installdir)s/bin/xpra',
 ]
 
+modextravars = {
+    'XPRA_SYSTEM_CONF_DIRS': '%(installdir)s/etc/xpra',
+}
 modextrapaths = {
     'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'],
 }
diff --git a/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch b/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f5afb0bbd1c9d32b75e92354286d7a87dd04343d
--- /dev/null
+++ b/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch
@@ -0,0 +1,23 @@
+diff -Naur xpra.orig/xpra/platform/xposix/menu_helper.py xpra/xpra/platform/xposix/menu_helper.py
+--- a/xpra.orig/xpra/platform/xposix/menu_helper.py	2022-03-30 23:59:37.274275428 +0200
++++ a/xpra/xpra/platform/xposix/menu_helper.py	2022-03-31 00:06:49.279245408 +0200
+@@ -177,8 +177,9 @@
+ def find_pixmap_icon(*names):
+     if not LOAD_FROM_PIXMAPS:
+         return None
++    pixmaps_dirs = [d + '/icons' for d in os.environ.get("XDG_DATA_DIRS").split(":")]
+     pixmaps_dir = "%s/share/pixmaps" % sys.prefix
+-    pixmaps_dirs = (pixmaps_dir, os.path.join(pixmaps_dir, "comps"))
++    pixmaps_dirs += (pixmaps_dir, os.path.join(pixmaps_dir, "comps"))
+     for d in pixmaps_dirs:
+         if not os.path.exists(d) or not os.path.isdir(d):
+             return None
+@@ -411,6 +412,8 @@
+         from xdg.Menu import MenuEntry
+         entries = {}
+         for d in LOAD_APPLICATIONS:
++            if not os.path.exists(d):
++                continue
+             for f in os.listdir(d):
+                 if not f.endswith(".desktop"):
+                     continue
diff --git a/Golden_Repo/x/xpra/xprahtml-4.5.2-encryptionfix.patch b/Golden_Repo/x/xpra/xprahtml-4.5.2-encryptionfix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..40ec1ed1dad2ef5d34d422336ff42e888fce423b
--- /dev/null
+++ b/Golden_Repo/x/xpra/xprahtml-4.5.2-encryptionfix.patch
@@ -0,0 +1,13 @@
+--- a/html5/js/Protocol.js.orig    2022-03-28 12:59:40.198667996 +0200
++++ b/html5/js/Protocol.js 2022-03-28 13:02:38.099943598 +0200
+@@ -631,6 +631,10 @@
+ 		throw "unsupported encryption specified: '"+cipher+"'";
+ 	}
+ 	const key_salt = caps["cipher.key_salt"];
++	let key_salt = caps["cipher.key_salt"];
++	if (typeof key_salt !== 'string') {
++		key_salt = String.fromCharCode.apply(null, key_salt);
++	}
+ 	const iterations = caps["cipher.key_stretch_iterations"];
+ 	if (iterations<0) {
+ 		throw "invalid number of iterations: "+iterations;
diff --git a/acls.yml b/acls.yml
index cc99219ccc75f63dae77057f5f1a746b1be557d7..04455503028040376dea5d884561693477c629e3 100644
--- a/acls.yml
+++ b/acls.yml
@@ -72,12 +72,18 @@ software:
   - name: 'Blosc'
     owner: 'goebbert1'
     base: True
+  - name: 'ceres-solver'
+    owner: 'goebbert1'
+    base: True
   - name: 'Cirq'
     owner: 'goebbert1'
     base: True
   - name: 'Cling'
     owner: 'goebbert1'
     base: True
+  - name: 'Colmap'
+    owner: 'goebbert1'
+    base: True
   - name: 'CVXOPT'
     owner: 'goebbert1'
     mpi: True
@@ -96,15 +102,27 @@ software:
   - name: 'FFmpeg'
     owner: 'goebbert1'
     base: True
+  - name: 'FreeImage'
+    owner: 'goebbert1'
+    base: True
   - name: 'FreeSurfer'
     owner: 'deepu1'
     base: True
   - name: 'eudev'
     owner: 'goebbert1'
     base: True
+  - name: 'glog'
+    owner: 'goebbert1'
+    base: True
   - name: 'GPicView'
     owner: 'goebbert1'
     base: True
+  - name: 'GStreamer'
+    owner: 'goebbert1'
+    base: True
+  - name: 'IRkernel'
+    owner: 'goebbert1'
+    base: True
   - name: 'ImageMagick'
     owner: 'goebbert1'
     base: True    
@@ -200,6 +218,9 @@ software:
   - name: 'lz4'
     owner: 'goebbert1'
     base: True
+  - name: 'MCR'
+    owner: 'goebbert1'
+    system: True
   - name: 'mpi4py'
     owner: 'goebbert1'
     mpi: True 
@@ -1057,3 +1078,6 @@ software:
   - name: 'AMD-uProf'
     owner: 'zhukov1'
     base: True
+  - name: 'HDFView'
+    owner: 'luehrs2'
+    base: True