diff --git a/Golden_Repo/p/popt/popt-1.18.eb b/Golden_Repo/p/popt/popt-1.18.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e6f801c8c216aa078fbce81684d586dd9741fd6f
--- /dev/null
+++ b/Golden_Repo/p/popt/popt-1.18.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'popt'
+version = '1.18'
+
+homepage = 'https://github.com/rpm-software-management/popt'
+description = 'Popt is a C library for parsing command line parameters.'
+
+toolchain = SYSTEM
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://ftp.rpm.org/popt/releases/popt-1.x']
+checksums = ['5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1']
+
+sanity_check_paths = {
+    'files': ['include/%(name)s.h', ('lib/libpopt.a', 'lib64/libpopt.a'), ('lib/libpopt.so', 'lib64/libpopt.so')],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/p/pscom/pscom-5.4-default.eb b/Golden_Repo/p/pscom/pscom-5.4-default.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b61232d5a8bbc6779df85720761a3a0d58ef51fb
--- /dev/null
+++ b/Golden_Repo/p/pscom/pscom-5.4-default.eb
@@ -0,0 +1,49 @@
+easyblock = 'CMakeMake'
+
+name = 'pscom'
+# Create drop-in replacement version that ensures overriding behaviour
+version = '5.4-default'
+local_realversion = '5.4.8-1'
+homepage = 'http://www.par-tec.com'
+description = """ParaStation is a robust and efficient cluster middleware, consisting of a high-performance
+communication layer (MPI) and a sophisticated management layer.
+"""
+
+toolchain = SYSTEM
+
+source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
+sources = ['%s.tar.gz' % local_realversion]
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('popt', '1.18'),
+    ('CUDA', '11.5'),
+    ('CMake', '3.21.1'),
+]
+
+dependencies = [
+    ('UCX', '1.11.2'),
+]
+
+build_type = 'RelWithDebInfo'
+
+preconfigopts = 'export UCP_LDFLAGS="-L$EBROOTUCX/lib" && '
+preconfigopts += 'export CUDA_LDFLAGS="-L$EBROOTNVIDIA/lib64" &&'
+
+configopts = '-DCUDA_ENABLED=ON'
+
+sanity_check_paths = {
+    'files': [
+        'include/%(name)s.h',
+        ('lib/libpscom.so', 'lib64/libpscom.so'),
+        ('lib/libpscom4ucp.so', 'lib64/libpscom4ucp.so'),
+        ('lib/libpscom4openib.so', 'lib64/libpscom4openib.so'),
+    ],
+    'dirs': [],
+}
+
+modextravars = {
+    'PSCOMVERSION': '%s' % local_realversion,
+}
+
+moduleclass = 'tools'