diff --git a/Golden_Repo/juwelsbooster_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb b/Golden_Repo/hdfml_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
similarity index 93%
rename from Golden_Repo/juwelsbooster_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
rename to Golden_Repo/hdfml_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
index 4dd2e09cef003c70fa54edefbcf3e251971c7018..32af8ba7451cb5c0b4a7fbbd3d7a6898e064d088 100644
--- a/Golden_Repo/juwelsbooster_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
+++ b/Golden_Repo/hdfml_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
@@ -16,8 +16,6 @@ toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
-patches = ['m4-1.4.18-glibc-change-work-around.patch']
-
# use same binutils version that was used when building GCC toolchain
builddependencies = [('binutils', '2.34', '', SYSTEM)]
diff --git a/Golden_Repo/juwelsbooster_overlay/m/M4/M4-1.4.18.eb b/Golden_Repo/hdfml_overlay/m/M4/M4-1.4.18.eb
similarity index 92%
rename from Golden_Repo/juwelsbooster_overlay/m/M4/M4-1.4.18.eb
rename to Golden_Repo/hdfml_overlay/m/M4/M4-1.4.18.eb
index a03bcc7ab52b62854890714b417e31952a178a92..d686b2eb04b511fde3cecd0ea74d3d3cb012f7d5 100644
--- a/Golden_Repo/juwelsbooster_overlay/m/M4/M4-1.4.18.eb
+++ b/Golden_Repo/hdfml_overlay/m/M4/M4-1.4.18.eb
@@ -17,8 +17,6 @@ toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
-patches = ['m4-1.4.18-glibc-change-work-around.patch']
-
configopts = "--enable-cxx"
sanity_check_paths = {
diff --git a/Golden_Repo/hdfml_overlay/u/UCX/UCX-1.9.0.eb b/Golden_Repo/hdfml_overlay/u/UCX/UCX-1.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cdf6510cf9b9cd517a3d306120d6215db617c86c
--- /dev/null
+++ b/Golden_Repo/hdfml_overlay/u/UCX/UCX-1.9.0.eb
@@ -0,0 +1,67 @@
+easyblock = 'ConfigureMake'
+
+name = 'UCX'
+version = '1.9.0'
+
+homepage = 'http://www.openucx.org'
+
+description = """Unified Communication X
+An open-source production grade communication framework for data centric
+and high-performance applications
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('pkg-config', '0.29.2'),
+]
+
+osdependencies = [
+ # needed for --with-verbs
+ ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
+]
+
+dependencies = [
+ ('numactl', '2.0.13'),
+ ('CUDA', '11.0'),
+]
+
+configopts = '--with-verbs ' # Build OpenFabrics support
+configopts += '--without-java '
+configopts += '--disable-doxygen-doc '
+
+configopts += '--enable-optimizations ' # Enable machine-specific optimizations, default: NO
+# configopts += '--enable-tuning ' # Enable parameter tuning in run-time, default: NO
+configopts += '--enable-mt ' # Enable thread support in UCP and UCT, default: NO
+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
+
+configopts += '--with-rc ' # Compile with IB Reliable Connection support
+configopts += '--with-ud ' # Compile with IB Unreliable Datagram support
+configopts += '--with-dc ' # Compile with IB Dynamic Connection support
+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
+
+sanity_check_paths = {
+ 'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
+ 'dirs': ['include', 'lib', 'share']
+}
+
+moduleclass = 'system'
diff --git a/Golden_Repo/jusuf_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb b/Golden_Repo/jusuf_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..32af8ba7451cb5c0b4a7fbbd3d7a6898e064d088
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.18'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+ although it has some extensions (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.34', '', SYSTEM)]
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+ 'files': ["bin/m4"],
+ 'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/jusuf_overlay/m/M4/M4-1.4.18.eb b/Golden_Repo/jusuf_overlay/m/M4/M4-1.4.18.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d686b2eb04b511fde3cecd0ea74d3d3cb012f7d5
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/m/M4/M4-1.4.18.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.18'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor.
+ It is mostly SVR4 compatible although it has some extensions
+ (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+ 'files': ["bin/m4"],
+ 'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/jusuf_overlay/u/UCX/UCX-1.9.0.eb b/Golden_Repo/jusuf_overlay/u/UCX/UCX-1.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cdf6510cf9b9cd517a3d306120d6215db617c86c
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/u/UCX/UCX-1.9.0.eb
@@ -0,0 +1,67 @@
+easyblock = 'ConfigureMake'
+
+name = 'UCX'
+version = '1.9.0'
+
+homepage = 'http://www.openucx.org'
+
+description = """Unified Communication X
+An open-source production grade communication framework for data centric
+and high-performance applications
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('pkg-config', '0.29.2'),
+]
+
+osdependencies = [
+ # needed for --with-verbs
+ ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
+]
+
+dependencies = [
+ ('numactl', '2.0.13'),
+ ('CUDA', '11.0'),
+]
+
+configopts = '--with-verbs ' # Build OpenFabrics support
+configopts += '--without-java '
+configopts += '--disable-doxygen-doc '
+
+configopts += '--enable-optimizations ' # Enable machine-specific optimizations, default: NO
+# configopts += '--enable-tuning ' # Enable parameter tuning in run-time, default: NO
+configopts += '--enable-mt ' # Enable thread support in UCP and UCT, default: NO
+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
+
+configopts += '--with-rc ' # Compile with IB Reliable Connection support
+configopts += '--with-ud ' # Compile with IB Unreliable Datagram support
+configopts += '--with-dc ' # Compile with IB Dynamic Connection support
+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
+
+sanity_check_paths = {
+ 'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
+ 'dirs': ['include', 'lib', 'share']
+}
+
+moduleclass = 'system'
diff --git a/Golden_Repo/juwelsbooster_overlay/u/UCX/UCX-1.9.0.eb b/Golden_Repo/juwelsbooster_overlay/u/UCX/UCX-1.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cdf6510cf9b9cd517a3d306120d6215db617c86c
--- /dev/null
+++ b/Golden_Repo/juwelsbooster_overlay/u/UCX/UCX-1.9.0.eb
@@ -0,0 +1,67 @@
+easyblock = 'ConfigureMake'
+
+name = 'UCX'
+version = '1.9.0'
+
+homepage = 'http://www.openucx.org'
+
+description = """Unified Communication X
+An open-source production grade communication framework for data centric
+and high-performance applications
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('pkg-config', '0.29.2'),
+]
+
+osdependencies = [
+ # needed for --with-verbs
+ ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
+]
+
+dependencies = [
+ ('numactl', '2.0.13'),
+ ('CUDA', '11.0'),
+]
+
+configopts = '--with-verbs ' # Build OpenFabrics support
+configopts += '--without-java '
+configopts += '--disable-doxygen-doc '
+
+configopts += '--enable-optimizations ' # Enable machine-specific optimizations, default: NO
+# configopts += '--enable-tuning ' # Enable parameter tuning in run-time, default: NO
+configopts += '--enable-mt ' # Enable thread support in UCP and UCT, default: NO
+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
+
+configopts += '--with-rc ' # Compile with IB Reliable Connection support
+configopts += '--with-ud ' # Compile with IB Unreliable Datagram support
+configopts += '--with-dc ' # Compile with IB Dynamic Connection support
+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
+
+sanity_check_paths = {
+ 'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
+ 'dirs': ['include', 'lib', 'share']
+}
+
+moduleclass = 'system'
diff --git a/Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb b/Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
index 32af8ba7451cb5c0b4a7fbbd3d7a6898e064d088..4dd2e09cef003c70fa54edefbcf3e251971c7018 100644
--- a/Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
+++ b/Golden_Repo/m/M4/M4-1.4.18-GCCcore-9.3.0.eb
@@ -16,6 +16,8 @@ toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
+patches = ['m4-1.4.18-glibc-change-work-around.patch']
+
# use same binutils version that was used when building GCC toolchain
builddependencies = [('binutils', '2.34', '', SYSTEM)]
diff --git a/Golden_Repo/m/M4/M4-1.4.18.eb b/Golden_Repo/m/M4/M4-1.4.18.eb
index d686b2eb04b511fde3cecd0ea74d3d3cb012f7d5..a03bcc7ab52b62854890714b417e31952a178a92 100644
--- a/Golden_Repo/m/M4/M4-1.4.18.eb
+++ b/Golden_Repo/m/M4/M4-1.4.18.eb
@@ -17,6 +17,8 @@ toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
+patches = ['m4-1.4.18-glibc-change-work-around.patch']
+
configopts = "--enable-cxx"
sanity_check_paths = {
diff --git a/Golden_Repo/juwelsbooster_overlay/m/M4/m4-1.4.18-glibc-change-work-around.patch b/Golden_Repo/m/M4/m4-1.4.18-glibc-change-work-around.patch
similarity index 100%
rename from Golden_Repo/juwelsbooster_overlay/m/M4/m4-1.4.18-glibc-change-work-around.patch
rename to Golden_Repo/m/M4/m4-1.4.18-glibc-change-work-around.patch
diff --git a/Golden_Repo/u/UCX/UCX-1.9.0.eb b/Golden_Repo/u/UCX/UCX-1.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..445a48c4a9065650b630c153d8a72162c268a9d5
--- /dev/null
+++ b/Golden_Repo/u/UCX/UCX-1.9.0.eb
@@ -0,0 +1,68 @@
+easyblock = 'ConfigureMake'
+
+name = 'UCX'
+version = '1.9.0'
+
+homepage = 'http://www.openucx.org'
+
+description = """Unified Communication X
+An open-source production grade communication framework for data centric
+and high-performance applications
+"""
+
+site_contacts = 'Damian Alvarez <d.alvarez@fz-juelich.de>'
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('pkg-config', '0.29.2'),
+]
+
+osdependencies = [
+ # needed for --with-verbs
+ ('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel'),
+]
+
+dependencies = [
+ ('numactl', '2.0.13'),
+ ('CUDA', '11.0'),
+]
+
+configopts = '--with-verbs ' # Build OpenFabrics support
+configopts += '--without-java '
+configopts += '--disable-doxygen-doc '
+
+configopts += '--enable-optimizations ' # Enable machine-specific optimizations, default: NO
+# configopts += '--enable-tuning ' # Enable parameter tuning in run-time, default: NO
+configopts += '--enable-mt ' # Enable thread support in UCP and UCT, default: NO
+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
+
+configopts += '--with-rc ' # Compile with IB Reliable Connection support
+configopts += '--with-ud ' # Compile with IB Unreliable Datagram support
+configopts += '--with-dc ' # Compile with IB Dynamic Connection support
+configopts += '--with-cm ' # Compile with IB Connection Manager support
+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
+
+sanity_check_paths = {
+ 'files': ['bin/ucx_info', 'bin/ucx_perftest', 'bin/ucx_read_profile'],
+ 'dirs': ['include', 'lib', 'share']
+}
+
+moduleclass = 'system'