diff --git a/Golden_Repo/b/Bazel/Bazel-3.7.1_fix-protobuf-env.patch b/Golden_Repo/b/Bazel/Bazel-3.7.1_fix-protobuf-env.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0e110a6723ddfcdf2db6035627a65baeda6535fd
--- /dev/null
+++ b/Golden_Repo/b/Bazel/Bazel-3.7.1_fix-protobuf-env.patch
@@ -0,0 +1,20 @@
+diff --git a/third_party/protobuf/3.13.0.patch b/third_party/protobuf/3.13.0.patch
+index bde8684b82..3336ef4024 100644
+--- a/third_party/protobuf/3.13.0.patch
++++ b/third_party/protobuf/3.13.0.patch
+@@ -38,3 +38,15 @@ index cfdb28e2e..3705fdbe3 100644
+ +        "@io_bazel//third_party:gson",
+      ],
+  )
++diff --git a/protobuf.bzl b/protobuf.bzl
++index 050eafc54..12d3edb94 100644
++--- a/protobuf.bzl
+++++ b/protobuf.bzl
++@@ -352,6 +352,7 @@ def _internal_gen_well_known_protos_java_impl(ctx):
++         inputs = descriptors,
++         outputs = [srcjar],
++         arguments = [args],
+++        use_default_shell_env = True,
++     )
++ 
++     return [
diff --git a/Golden_Repo/b/Bazel/Bazel-3.7.2_fix-GCC-11.patch b/Golden_Repo/b/Bazel/Bazel-3.7.2_fix-GCC-11.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6f1575c39c2c0318b7382d3845faf823d2cbf1bf
--- /dev/null
+++ b/Golden_Repo/b/Bazel/Bazel-3.7.2_fix-GCC-11.patch
@@ -0,0 +1,22 @@
+add missing include statements to fix compilation with GCC 11.x
+author: Alexandre Strube (JSC)
+--- src/third_party/ijar/zlib_client.h.orig	2021-11-05 15:39:58.061336981 +0100
++++ src/third_party/ijar/zlib_client.h	2021-11-05 15:40:22.650877105 +0100
+@@ -16,6 +16,7 @@
+ #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
+ 
+ #include <limits.h>
++#include <limits>
+ 
+ #include "third_party/ijar/common.h"
+ 
+--- src/third_party/ijar/mapped_file.h.orig	2021-11-05 15:56:24.654184777 +0100
++++ src/third_party/ijar/mapped_file.h	2021-11-05 15:56:33.879015290 +0100
+@@ -16,6 +16,7 @@
+ #define INCLUDED_THIRD_PARTY_IJAR_MAPPED_FILE_H
+ 
+ #include "third_party/ijar/common.h"
++#include <limits>
+ 
+ namespace devtools_ijar {
+ 
diff --git a/Golden_Repo/b/Bazel/Bazel-5.1.1-GCCcore-11.3.0.eb b/Golden_Repo/b/Bazel/Bazel-5.1.1-GCCcore-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2550749a05933ecea4f994890686b0457dd45a6c
--- /dev/null
+++ b/Golden_Repo/b/Bazel/Bazel-5.1.1-GCCcore-11.3.0.eb
@@ -0,0 +1,33 @@
+name = 'Bazel'
+version = '5.1.1'
+
+homepage = 'https://bazel.io/'
+description = """Bazel is a build tool that builds code quickly and reliably.
+It is used to build the majority of Google's software."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+
+source_urls = ['https://github.com/bazelbuild/%(namelower)s/releases/download/%(version)s']
+sources = ['%(namelower)s-%(version)s-dist.zip']
+patches = [
+    'Bazel-3.7.1_fix-protobuf-env.patch',
+    'Bazel-3.7.2_fix-GCC-11.patch',
+]
+checksums = [
+    '7f5d3bc1d344692b2400f3765fd4b5c0b636eb4e7a8a7b17923095c7b56a4f78',  # bazel-5.1.1-dist.zip
+    '8706ecc99b658e0a96c38dc2c23e44da35059b85f308602aac76a6d6680376e7',  # Bazel-3.7.1_fix-protobuf-env.patch
+    '7fd5846f2ed1f27af9528a900f284f95ad982f3e7d486264c3bdee890a9c22fb',  # Bazel-3.7.2_fix-GCC-11.patch
+]
+
+builddependencies = [
+    ('binutils', '2.38'),
+    ('Python', '3.10.4'),
+    ('Zip', '3.0'),
+]
+
+dependencies = [('Java', '11', '', SYSTEM)]
+
+runtest = True
+testopts = "-- //examples/cpp:hello-success_test //examples/py/... //examples/py_native:test //examples/shell/..."
+
+moduleclass = 'devel'