diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25158302232659cb1861643f4bf11346ea0f5b4a
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-GCCcore-11.2.0-nompi.eb
@@ -0,0 +1,48 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+versionsuffix = '-nompi'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    ('CMake', '3.21.1'),
+]
+
+dependencies = [
+    ('netCDF', '4.8.1', '-serial'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b870a44fb06de7726b1aa1235222de3ce92333cd
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gompi-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'gompi', 'version': '2021b'}
+toolchainopts = {'usempi': False, 'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [('CMake', '3.21.1')]
+
+dependencies = [
+    ('netCDF', '4.8.1'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..825af93458f756e1d548010e84a50f18466ae4fa
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-gpsmpi-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'gpsmpi', 'version': '2021b'}
+toolchainopts = {'usempi': False, 'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [('CMake', '3.21.1')]
+
+dependencies = [
+    ('netCDF', '4.8.1'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..81c01d7d0df8bc55abbf67b7513b3d3bdeda1e4d
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iimpi-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'iimpi', 'version': '2021b'}
+toolchainopts = {'usempi': False, 'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [('CMake', '3.21.1')]
+
+dependencies = [
+    ('netCDF', '4.8.1'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0539fe5892e339c1051cbc29fcc9be56a3a9a118
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-iompi-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'iompi', 'version': '2021b'}
+toolchainopts = {'usempi': False, 'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [('CMake', '3.21.1')]
+
+dependencies = [
+    ('netCDF', '4.8.1'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7b096bfe9a0b77f510cf3cc5e49def6f11c0fcb5
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-ipsmpi-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'ipsmpi', 'version': '2021b'}
+toolchainopts = {'usempi': False, 'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [('CMake', '3.21.1')]
+
+dependencies = [
+    ('netCDF', '4.8.1'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..464f977638d2ead2bcb5c7c05d02776c1c98c07e
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-npsmpic-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'npsmpic', 'version': '2021b'}
+toolchainopts = {'usempi': False, 'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [('CMake', '3.21.1')]
+
+dependencies = [
+    ('netCDF', '4.8.1'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1d870b9f9279779a661ecd1204e2c292564c5167
--- /dev/null
+++ b/Golden_Repo/e/ecCodes/ecCodes-2.22.1-nvompic-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.22.1'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'nvompic', 'version': '2021b'}
+toolchainopts = {'usempi': False, 'openmp': True}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['75c7ee96469bb30b0c8f7edbdc4429ece4415897969f75c36173545242bc9e85']
+
+builddependencies = [('CMake', '3.21.1')]
+
+dependencies = [
+    ('netCDF', '4.8.1'),
+    ('JasPer', '2.0.33'),
+    ('libjpeg-turbo', '2.1.1'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+# Python bindings are now provided by a separate package 'eccodes-python'
+configopts = "-DENABLE_NETCDF=ON -DENABLE_PNG=ON "
+configopts += "-DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=ON "
+configopts += "-DENABLE_ECCODES_OMP_THREADS=ON"
+
+local_exes = ['%s_%s' % (a, b)
+              for a in ['bufr', 'grib', 'gts', 'metar']
+              for b in ['compare', 'copy', 'dump', 'filter', 'get', 'ls']]
+local_exes += ['codes_%s' % c for c in ['count', 'info', 'split_file']]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_exes] +
+             ['lib/libeccodes_f90.%s' % SHLIB_EXT, 'lib/libeccodes.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb b/Golden_Repo/n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e6ab03122744e5efe24d2fbd33000173fe12f69a
--- /dev/null
+++ b/Golden_Repo/n/ncview/ncview-2.1.8-GCCcore-11.2.0.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncview'
+version = "2.1.8"
+
+homepage = 'http://meteora.ucsd.edu/~pierce/ncview_home_page.html'
+description = """Ncview is a visual browser for netCDF format files. 
+Typically you would use ncview to get a quick and easy, push-button 
+look at your netCDF files. You can view simple movies of the data, 
+view along various dimensions, take a look at the actual data values, 
+change color maps, invert the data, etc."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['ftp://cirrus.ucsd.edu/pub/ncview/']
+sources = [SOURCE_TAR_GZ]
+checksums = ['e8badc507b9b774801288d1c2d59eb79ab31b004df4858d0674ed0d87dfc91be']
+
+preconfigopts = 'CC=$(which $CC) '
+configopts = '--with-udunits2_incdir=$EBROOTUDUNITS/include --with-udunits2_libdir=$EBROOTUDUNITS/lib '
+configopts += '--with-png_libdir=$EBROOTLIBPNG/lib --with-png_incdir=$EBROOTLIBPNG/include'
+
+builddependencies = [
+    ('binutils', '2.37'),
+]
+
+dependencies = [
+    ('netCDF', '4.8.1', '-serial'),
+    ('UDUNITS', '2.2.28'),
+    ('X11', '20210802'),
+    ('libpng', '1.6.37'),
+    ('zlib', '1.2.11'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/ncview'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/acls.yml b/acls.yml
index 9a8aa0ab678673d1ac3b4c4cc67daa0013125439..86b2302afd9a7e89abd5317543768bcb2e5fac02 100644
--- a/acls.yml
+++ b/acls.yml
@@ -880,9 +880,6 @@ software:
     owner: 'luehrs2'
     base: True
     mpi: True
-  - name: 'HDFView'
-    owner: 'luehrs2'
-    base: True
   - name: 'h5py'
     owner: 'luehrs2'
     base: True
@@ -1016,3 +1013,7 @@ software:
   - name: 'LCov'
     owner: 'guimaraes1'
     base: True
+  - name: 'ecCodes'
+    owner: 'luehrs2'
+    base: True
+    mpi: True