diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb
index a5a4de37df0a6563e0c8fad229beacfd0a78191b..51423a86f3398bcbd9918d7a7642d70deb57f401 100644
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb
+++ b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gompi-2021b.eb
@@ -5,8 +5,6 @@ version = "1.0.1"
 homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
 description = 'I/O forwarding for SIONlib'
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'gompi', 'version': '2021b'}
 toolchainopts = {'pic': True}
 
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb
index 835fbede9569d4c21500e60ca0b088cd65430f31..d44a588a2fc82a8b1245b89d1cd21e75e0de0639 100644
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb
+++ b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-gpsmpi-2021b.eb
@@ -5,8 +5,6 @@ version = "1.0.1"
 homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
 description = 'I/O forwarding for SIONlib'
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'gpsmpi', 'version': '2021b'}
 toolchainopts = {'pic': True}
 
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb
index c735984c3e70f360ad560c5eba083adf98811c13..d0c69f3d2bf1634df3b06481dbd4420409b30dd3 100644
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb
+++ b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iimpi-2021b.eb
@@ -5,8 +5,6 @@ version = "1.0.1"
 homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
 description = 'I/O forwarding for SIONlib'
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'iimpi', 'version': '2021b'}
 toolchainopts = {'pic': True}
 
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb
index 44f437202ed534892e5fb0f284a62080fed5a64c..9578e69245acdd5783545aa22d1ce261f659816e 100644
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb
+++ b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-iompi-2021b.eb
@@ -5,8 +5,6 @@ version = "1.0.1"
 homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
 description = 'I/O forwarding for SIONlib'
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'iompi', 'version': '2021b'}
 toolchainopts = {'pic': True}
 
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb
index f7f391ef0d964f74a2d1cfccbf4f5d38671433f5..d94cdc4b274bb6671643d1872c56119a769c9bbf 100644
--- a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb
+++ b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-ipsmpi-2021b.eb
@@ -5,8 +5,6 @@ version = "1.0.1"
 homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
 description = 'I/O forwarding for SIONlib'
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'ipsmpi', 'version': '2021b'}
 toolchainopts = {'pic': True}
 
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ef13cf36a9ddbc44a1c38cb460b7092759783cc0
--- /dev/null
+++ b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-npsmpic-2021b.eb
@@ -0,0 +1,22 @@
+easyblock = "CMakeMake"
+name = "SIONfwd"
+version = "1.0.1"
+
+homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
+description = 'I/O forwarding for SIONlib'
+
+toolchain = {'name': 'npsmpic', 'version': '2021b'}
+toolchainopts = {'pic': True}
+
+builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
+
+source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
+sources = ['SIONfwd-v%(version)s.tar.gz']
+checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
+
+sanity_check_paths = {
+    'files': ["bin/sionfwd-server"],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b530b897c9336ccd4d6a5ddf2bf5ce967a89a05
--- /dev/null
+++ b/Golden_Repo/s/SIONfwd/SIONfwd-1.0.1-nvompic-2021b.eb
@@ -0,0 +1,22 @@
+easyblock = "CMakeMake"
+name = "SIONfwd"
+version = "1.0.1"
+
+homepage = 'https://gitlab.version.fz-juelich.de/SIONlib/SIONfwd'
+description = 'I/O forwarding for SIONlib'
+
+toolchain = {'name': 'nvompic', 'version': '2021b'}
+toolchainopts = {'pic': True}
+
+builddependencies = [('CMake', '3.21.1', '', SYSTEM)]
+
+source_urls = ['https://gitlab.jsc.fz-juelich.de/SIONlib/SIONfwd/-/archive/v%(version)s/']
+sources = ['SIONfwd-v%(version)s.tar.gz']
+checksums = ['bb4b0381dec8729ed792225f90b7a2b04049886989e53216bc1033585448a780']
+
+sanity_check_paths = {
+    'files': ["bin/sionfwd-server"],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb
index 321b5b2f282c5b7201e841273fed9dac7d50b1a7..b17b2690d318bae0c58bbe113b10cfab372d5f04 100644
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-GCCcore-11.2.0-tools.eb
@@ -13,8 +13,6 @@ to avoid conflicts when an application using SIONlib itself is linked against a
 a different SIONlib version.
 """
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 
 source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)sl']
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb
index 4a137913a8b443cf510d1a51194bad281c2603fb..e3ca3c986655ed0e6ec942dc1c8d42252145dce3 100644
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gompi-2021b.eb
@@ -13,8 +13,6 @@ MPI, OpenMP, or their combination and sequential access for
 post-processing utilities.
 """
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'gompi', 'version': '2021b'}
 
 dependencies = [('SIONfwd', '1.0.1')]
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb
index c8387088eaa1793190b2ade7b816cb0803956afc..8a41fbc09e88c3d4d3fe83a2e5b0ee368c76d36d 100644
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-gpsmpi-2021b.eb
@@ -13,8 +13,6 @@ MPI, OpenMP, or their combination and sequential access for
 post-processing utilities.
 """
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'gpsmpi', 'version': '2021b'}
 
 dependencies = [('SIONfwd', '1.0.1')]
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb
index d0babfb4a4f382e1fdbe240fe5fa9f02d289a5c0..ddf0026b13800e3b9589741584510b6694bdf02f 100644
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iimpi-2021b.eb
@@ -13,8 +13,6 @@ MPI, OpenMP, or their combination and sequential access for
 post-processing utilities.
 """
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'iimpi', 'version': '2021b'}
 
 dependencies = [('SIONfwd', '1.0.1')]
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb
index 2717fb2aff6f8087f413010897ab0e96ff9bc3fc..8488c00b1a1bda93d23f3260688064bfa5ba39a2 100644
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-iompi-2021b.eb
@@ -13,8 +13,6 @@ MPI, OpenMP, or their combination and sequential access for
 post-processing utilities.
 """
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'iompi', 'version': '2021b'}
 
 dependencies = [('SIONfwd', '1.0.1')]
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb
index 8a0060b73e8e816b57b3407ceafcadf31e7cc57c..2cf8c1b89bb3159e09e30855dfca5f58e17f5b38 100644
--- a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-ipsmpi-2021b.eb
@@ -13,8 +13,6 @@ MPI, OpenMP, or their combination and sequential access for
 post-processing utilities.
 """
 
-site_contacts = 'Tom Ridley <t.ridley@fz-juelich.de>'
-
 toolchain = {'name': 'ipsmpi', 'version': '2021b'}
 
 dependencies = [('SIONfwd', '1.0.1')]
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..61cc962d279a1563ef3ec7230a6d8212441791a6
--- /dev/null
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-npsmpic-2021b.eb
@@ -0,0 +1,41 @@
+easyblock = "ConfigureMake"
+name = "SIONlib"
+version = "1.7.7"
+
+homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
+description = """SIONlib is a scalable I/O library for the parallel access to
+task-local files. The library not only supports writing and reading
+binary data to or from from several thousands of processors into a
+single or a small number of physical files but also provides for
+global open and close functions to access SIONlib file in
+parallel. SIONlib provides different interfaces: parallel access using
+MPI, OpenMP, or their combination and sequential access for
+post-processing utilities.
+"""
+
+toolchain = {'name': 'npsmpic', 'version': '2021b'}
+
+dependencies = [('SIONfwd', '1.0.1')]
+
+builddependencies = [('pkg-config', '0.29.2')]
+
+source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
+sources = ['sionlib-%(version)s.tar.gz']
+patches = ['sionlib_psmpi.patch']
+checksums = [
+    'a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477',  # sionlib-1.7.7.tar.gz
+    'b947e51eb3c7768661a027ee21b548383ec57a9fe9cc9563d998f3bf01ac4fb0',  # sionlib_psmpi.patch
+]
+
+configopts = '--disable-mic --compiler=pgi --mpi=psmpi --disable-cxx '
+configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
+
+sanity_check_paths = {
+    'files': [
+        "bin/sionconfig",
+        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
+    ],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/Golden_Repo/s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3a500b2ca99aeb821f68604b9597e029ba9eb164
--- /dev/null
+++ b/Golden_Repo/s/SIONlib/SIONlib-1.7.7-nvompic-2021b.eb
@@ -0,0 +1,37 @@
+easyblock = "ConfigureMake"
+name = "SIONlib"
+version = "1.7.7"
+
+homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
+description = """SIONlib is a scalable I/O library for the parallel access to
+task-local files. The library not only supports writing and reading
+binary data to or from from several thousands of processors into a
+single or a small number of physical files but also provides for
+global open and close functions to access SIONlib file in
+parallel. SIONlib provides different interfaces: parallel access using
+MPI, OpenMP, or their combination and sequential access for
+post-processing utilities.
+"""
+
+toolchain = {'name': 'nvompic', 'version': '2021b'}
+
+dependencies = [('SIONfwd', '1.0.1')]
+
+builddependencies = [('pkg-config', '0.29.2')]
+
+configopts = '--disable-mic --compiler=pgi --mpi=openmpi --disable-cxx '
+configopts += '--enable-sionfwd="$EBROOTSIONFWD" CFLAGS="$CFLAGS -fPIC" '
+
+source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
+sources = ['sionlib-%(version)s.tar.gz']
+checksums = ['a73574b1c17c030b1d256c5f0eac5ff596395f8b827d759af83473bf94f74477']
+
+sanity_check_paths = {
+    'files': [
+        "bin/sionconfig",
+        ("lib64/libsioncom_64.a", "lib/libsionmpi_64.a", "lib64/libsionmpi_64.a"),
+    ],
+    'dirs': []
+}
+
+moduleclass = 'lib'