diff --git a/Golden_Repo/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb b/Golden_Repo/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e590dd730ca7a04f2426e94ead680893538318fb
--- /dev/null
+++ b/Golden_Repo/o/OpenStackClient/OpenStackClient-5.8.0-GCCcore-11.2.0.eb
@@ -0,0 +1,133 @@
+easyblock = 'PythonBundle'
+
+name = 'OpenStackClient'
+version = '5.8.0'
+
+homepage = 'https://docs.openstack.org/python-openstackclient/latest/'
+description = """OpenStackClient (aka OSC) is a command-line client for OpenStack that brings the
+command set for Compute, Identity, Image, Network, Object Store and Block       
+Storage APIs together in a single shell with a uniform command structure."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+dependencies = [
+    ('Python', '3.9.6'),
+    ('PyYAML', '5.4.1'),
+    ('typing-extensions', '3.10.0.2'),
+]
+builddependencies = [('binutils', '2.37')]
+
+exts_default_options = {
+    'use_pip': True,
+}
+exts_list = [
+    ('pyperclip', '1.8.2', {
+        'checksums': ['105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57'],
+    }),
+    ('importlib_metadata', '4.11.4', {
+        'checksums': ['5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700'],
+    }),
+    ('cmd2', '2.4.1', {
+        'checksums': ['f3b0467daca18fca0dc7838de7726a72ab64127a018a377a86a6ed8ebfdbb25f'],
+    }),
+    ('charset-normalizer', '2.0.12', {
+        'checksums': ['2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597'],
+    }),
+    ('jsonpointer', '2.3', {
+        'checksums': ['97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a'],
+    }),
+    ('prettytable', '3.3.0', {
+        'checksums': ['118eb54fd2794049b810893653b20952349df6d3bc1764e7facd8a18064fa9b0'],
+    }),
+    ('autopage', '0.5.0', {
+        'checksums': ['5305b43cc0798170d7124e5a2feecf969e45f4a0baf75cb351138114eaf76b83'],
+    }),
+    ('stevedore', '3.5.0', {
+        'checksums': ['f40253887d8712eaa2bb0ea3830374416736dc8ec0e22f5a65092c1174c44335'],
+    }),
+    ('cliff', '3.10.1', {
+        'checksums': ['045aee3f3c64471965d7ad507ce8474a4e2f20815fbb5405a770f8596a2a00a0'],
+    }),
+    ('dogpile.cache', '1.1.5', {
+        'checksums': ['0f01bdc329329a8289af9705ff40fadb1f82a28c336f3174e12142b70d31c756'],
+    }),
+    ('iso8601', '1.0.2', {
+        'checksums': ['27f503220e6845d9db954fb212b95b0362d8b7e6c1b2326a87061c3de93594b1'],
+    }),
+    ('jmespath', '1.0.0', {
+        'checksums': ['a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e'],
+    }),
+    ('jsonpatch', '1.32', {
+        'checksums': ['b6ddfe6c3db30d81a96aaeceb6baf916094ffa23d7dd5fa2c13e13f8b6e600c2'],
+    }),
+    ('os-service-types', '1.7.0', {
+        'checksums': ['31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c'],
+    }),
+    ('keystoneauth1', '4.6.0', {
+        'checksums': ['066f1addd89114cd6a1b9cb3555c8eaa7d013673ee1034bdfe506068804a9e05'],
+    }),
+    ('munch', '2.5.0', {
+        'checksums': ['2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2'],
+    }),
+    ('requestsexceptions', '1.4.0', {
+        'checksums': ['b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065'],
+    }),
+    ('openstacksdk', '0.99.0', {
+        'modulename': 'openstack',
+        'checksums': ['3f73c3cc28089e93b342eb7f348b285f5a65ffe505898be15db250c75bb855eb'],
+    }),
+    ('oslo.i18n', '5.1.0', {
+        'modulename': 'oslo_i18n',
+        'checksums': ['6bf111a6357d5449640852de4640eae4159b5562bbba4c90febb0034abc095d0'],
+    }),
+    ('wrapt', '1.14.1', {
+        'checksums': ['380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d'],
+    }),
+    ('debtcollector', '2.5.0', {
+        'checksums': ['dc9d1ad3f745c43f4bbedbca30f9ffe8905a8c028c9926e61077847d5ea257ab'],
+    }),
+    ('oslo.utils', '4.13.0', {
+        'modulename': 'oslo_utils',
+        'checksums': ['45ba8aaa5ed056a8e8e46059ef93d5c2d7b9c99bc7480e361cf5783e47f28fba'],
+    }),
+    ('osc-lib', '2.6.0', {
+        'checksums': ['854eabb14ad3480f4cdc63a55944e0ce2d9cc4ce2683cdfddadcd149821e67ab'],
+    }),
+    ('oslo.serialization', '4.3.0', {
+        'modulename': 'oslo_serialization',
+        'checksums': ['3aa472f434aee8bbcc0725312b7f409aa1fa54bbc134904124cf49b0e86b9115'],
+    }),
+    ('rfc3986', '2.0.0', {
+        'checksums': ['97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c'],
+    }),
+    ('oslo.config', '8.8.0', {
+        'modulename': 'oslo_config',
+        'checksums': ['96933d3011dae15608a11616bfb00d947e22da3cb09b6ff37ddd7576abd4764c'],
+    }),
+    ('python-novaclient', '18.0.0', {
+        'modulename': 'novaclient',
+        'checksums': ['e9eb2a9bdba464d820c100775c3c2f6493088df66af13dfb9325cc6b865c8d23'],
+    }),
+    ('python-keystoneclient', '4.5.0', {
+        'modulename': 'keystoneclient',
+        'checksums': ['6d7f05c692e7db2692778284c779ae6cea8b2159914b4417a5fa0bfea1e29cdc'],
+    }),
+    ('python-cinderclient', '8.3.0', {
+        'modulename': 'cinderclient',
+        'checksums': ['e00103875029dc85cbb59131d00ccc8534f692956acde32b5a3cc5af4c24580b'],
+    }),
+    ('python-openstackclient', version, {
+        'modulename': 'openstackclient',
+        'checksums': ['334852df8897b95f0581ec12ee287de8c7a9289a208a18f0a8b38777019fd986'],
+    }),
+]
+
+sanity_pip_check = True
+enhance_sanity_check = True
+sanity_check_commands = ['openstack -h']
+
+sanity_check_paths = {
+    'files': ['bin/openstack'],
+    'dirs': ["bin", 'lib/python%(pyshortver)s/site-packages']
+}
+
+moduleclass = 'tools'