diff --git a/Golden_Repo/a/Apptainer-Tools/Apptainer-Tools-2022-GCCcore-11.3.0.eb b/Golden_Repo/a/Apptainer-Tools/Apptainer-Tools-2022-GCCcore-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a8fc84bf52639513fc029343708999fb941d5a1
--- /dev/null
+++ b/Golden_Repo/a/Apptainer-Tools/Apptainer-Tools-2022-GCCcore-11.3.0.eb
@@ -0,0 +1,46 @@
+easyblock = 'PythonBundle'
+name = 'Apptainer-Tools'
+version = '2022'
+
+homepage = 'https://gitlab.version.fz-juelich.de/hps-public/container-build-system-cli'
+description = """Apptainer-Tools contain a bunch of tools for Apptainer,
+ e.g. the JSC Build System CLI or singularity-compose.
+"""
+
+site_contacts = 'Ruben Simons <r.simons@fz-juelich.de>'
+
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+
+builddependencies = [('binutils', '2.38')]
+
+dependencies = [
+    ('Python', '3.10.4'),
+    ('pretty-yaml', '20.4.0')
+]
+
+use_pip = True
+
+exts_list = [
+    ('semver', '2.13.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/semver'],
+        'checksums': ['fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f'],
+    }),
+    ('spython', '0.3.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/spython'],
+        'checksums': ['1bbadb18829aaf18e68bcdb9850e6e8c1e1be9066fbd4b71e1fff88f7d80b76f'],
+    }),
+    ('singularity-compose', '0.1.18', {
+        'modulename': 'scompose',
+        'source_urls': ['https://pypi.python.org/packages/source/p/singularity-compose'],
+        'checksums': ['177de30bd8c7813bfe668af20e93a0fa9bed0f00541611a1a2cebff49812f54f'],
+    }),
+    ('sib', '0.1.1', {
+        'modulename': 'singularitydb_client',
+        'sources': ['container-build-system-cli-v%(version)s.tar.gz'],
+        'checksums': ['ac008ec07b886470e916a590b965624d89e8206b491aaef697b8a425f3718dd6'],
+    }),
+]
+
+sanity_pip_check = True
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/hidden_deps.txt b/Golden_Repo/hidden_deps.txt
index d05bba69e625c252472cf8c6cd3ebc2726337035..c9df03a99156990aa67f5944739e66dd3d8960d7 100644
--- a/Golden_Repo/hidden_deps.txt
+++ b/Golden_Repo/hidden_deps.txt
@@ -92,6 +92,7 @@ PnMPI
 PyCairo
 PyGObject
 Python-Xpra
+pretty-yaml
 Qhull
 Qt
 Qt5
diff --git a/Golden_Repo/p/pretty-yaml/pretty-yaml-21.10.1-GCCcore-11.3.0.eb b/Golden_Repo/p/pretty-yaml/pretty-yaml-21.10.1-GCCcore-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..589ccccf4a48b7b39d2b697d084f27891c7c9c3a
--- /dev/null
+++ b/Golden_Repo/p/pretty-yaml/pretty-yaml-21.10.1-GCCcore-11.3.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'PythonPackage'
+
+name = 'pretty-yaml'
+local_mod = 'pyaml'
+version = '21.10.1'
+
+homepage = 'https://github.com/mk-fg/pretty-yaml'
+description = """PyYAML-based python module to produce pretty and readable YAML-serialized data.
+This module is for serialization only, see ruamel.yaml module for literate YAML
+parsing (keeping track of comments, spacing, line/column numbers of values, etc)."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://pypi.python.org/packages/source/p/%s/' % local_mod]
+sources = ['%s-%%(version)s.tar.gz' % local_mod]
+checksums = ['29a5c2a68660a799103d6949167bd6c7953d031449d08802386372de1db6ad71']
+
+builddependencies = [('binutils', '2.38')]
+
+dependencies = [
+    ('Python', '3.10.4'),
+    ('PyYAML', '6.0'),
+]
+
+use_pip = True
+download_dep_fail = True
+sanity_pip_check = True
+
+options = {'modulename': local_mod}
+
+moduleclass = 'lib'