diff --git a/Golden_Repo/g/Go/Go-1.17.3.eb b/Golden_Repo/g/Go/Go-1.17.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bc03da2a2a5dc72fba1c3e9d0f97493f603b0c99
--- /dev/null
+++ b/Golden_Repo/g/Go/Go-1.17.3.eb
@@ -0,0 +1,30 @@
+easyblock = 'Tarball'
+
+name = 'Go'
+version = '1.17.3'
+
+homepage = 'https://www.golang.org'
+description = """Go is an open source programming language that makes it easy to build
+ simple, reliable, and efficient software."""
+
+toolchain = SYSTEM
+
+source_urls = ['https://storage.googleapis.com/golang/']
+
+local_archs = {'aarch64': 'arm64', 'x86_64': 'amd64'}
+sources = ['go%%(version)s.linux-%s.tar.gz' % local_archs[ARCH]]
+checksums = [{
+    'go%(version)s.linux-amd64.tar.gz': '550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c',
+    'go%(version)s.linux-arm64.tar.gz': '06f505c8d27203f78706ad04e47050b49092f1b06dc9ac4fbee4f0e4d015c8d4',
+}]
+
+sanity_check_paths = {
+    'files': ['bin/go', 'bin/gofmt'],
+    'dirs': ['api', 'doc', 'lib', 'pkg'],
+}
+
+sanity_check_commands = ["go help"]
+
+modextravars = {'GOROOT': '%(installdir)s'}
+
+moduleclass = 'compiler'
diff --git a/Golden_Repo/g/Go/Go-1.8.1.eb b/Golden_Repo/g/Go/Go-1.8.1.eb
deleted file mode 100644
index 3ff907c5b79bd8cfd4b9316dc2f7b13512251dc6..0000000000000000000000000000000000000000
--- a/Golden_Repo/g/Go/Go-1.8.1.eb
+++ /dev/null
@@ -1,22 +0,0 @@
-easyblock = 'Tarball'
-
-name = 'Go'
-version = '1.8.1'
-
-homepage = 'http://www.golang.org'
-description = """Go is an open source programming language that makes it easy to build
- simple, reliable, and efficient software."""
-
-toolchain = SYSTEM
-
-source_urls = ['https://storage.googleapis.com/golang/']
-sources = ['%(namelower)s%(version)s.linux-amd64.tar.gz']
-checksums = ['a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994']
-
-sanity_check_paths = {
-    'files': ['bin/go', 'bin/gofmt'],
-    'dirs': ['api', 'doc', 'lib', 'pkg'],
-}
-
-modextravars = {'GOROOT': '%(installdir)s'}
-moduleclass = 'compiler'
diff --git a/Golden_Repo/g/git-lfs/git-lfs-2.11.0.eb b/Golden_Repo/g/git-lfs/git-lfs-2.11.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1e78347496585f86212a3d564d77e93dbb607a77
--- /dev/null
+++ b/Golden_Repo/g/git-lfs/git-lfs-2.11.0.eb
@@ -0,0 +1,29 @@
+easyblock = 'MakeCp'
+
+name = 'git-lfs'
+version = '2.11.0'
+
+homepage = 'https://git-lfs.github.com'
+description = """Git Large File Storage (LFS) replaces large files such as audio
+ samples, videos, datasets, and graphics with text pointers inside Git, while 
+ storing the file contents on a remote server like GitHub.com"""
+
+toolchain = SYSTEM
+
+github_account = name
+source_urls = [GITHUB_SOURCE]
+sources = ['v%(version)s.tar.gz']
+checksums = ['8183c4cbef8cf9c2e86b0c0a9822451e2df272f89ceb357c498bfdf0ff1b36c7']
+
+builddependencies = [('Go', '1.17.3')]
+
+files_to_copy = [(['bin/%(name)s'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/git-lfs'],
+    'dirs': [],
+}
+
+sanity_check_commands = [('git-lfs', '--version')]
+
+moduleclass = 'tools'
diff --git a/bin/gcc11ize.py b/bin/gcc11ize.py
index bc12162c905e00226112dd7a1ae7cbce8b30cd58..f6f606c7db0e42c5885a01d5e59c8d56ade7fba2 100755
--- a/bin/gcc11ize.py
+++ b/bin/gcc11ize.py
@@ -43,6 +43,7 @@ releases = {
     'Ghostscript':              ['9.52',            '9.54.0'],
     'GLib':                     ['2.64.4',          '2.69.1'],
     'GMP':                      ['6.2.0',           '6.2.1'],
+    'Go':                       ['1.15.3',          '1.17.3'],
     'GObject-Introspection':    ['1.64.1',          '1.68.0'],
     'gomkl':                    ['2021',            '2021b'],
     'gpsmkl':                   ['2021',            '2021b'],
@@ -113,6 +114,7 @@ releases = {
     'x264':                     ['20200912',        '20210613'],
     'XServer':                  ['1.20.9',          '1.20.13'],
     'zlib':                     ['1.2.11',          '1.2.11'],
+    'zstd':                     ['1.4.9',           '1.5.0'],
 }