diff --git a/manifests/g/GoLang/Go/1.16.2/GoLang.Go.installer.yaml b/manifests/g/GoLang/Go/1.16.2/GoLang.Go.installer.yaml
new file mode 100644
index 000000000..446197814
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.16.2/GoLang.Go.installer.yaml
@@ -0,0 +1,17 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: GoLang.Go
+PackageVersion: 1.16.2
+Installers:
+- Architecture: x64
+  InstallerUrl: https://golang.org/dl/go1.16.2.windows-amd64.msi
+  InstallerSha256: AD7C65AA63842E6A2AE15A32F01D1E0D8D79B032869203C7DD84E4891468719F
+  InstallerType: msi
+  ProductCode: "{7AE06CDD-83C9-49F3-8380-792E65AEA37D}"
+- Architecture: x86
+  InstallerUrl: https://golang.org/dl/go1.16.2.windows-386.msi
+  InstallerSha256: 644BB475E520E2AEF1D9905229FAA2C90E46507F8EE8D8D0614F2525F40CF618
+  InstallerType: msi
+  ProductCode: "{7F5BA144-2D49-44A5-B55D-98B41202318E}"
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/g/GoLang/Go/1.16.2/GoLang.Go.locale.en-US.yaml b/manifests/g/GoLang/Go/1.16.2/GoLang.Go.locale.en-US.yaml
new file mode 100644
index 000000000..79fd29d3b
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.16.2/GoLang.Go.locale.en-US.yaml
@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: GoLang.Go
+PackageVersion: 1.16.2
+PackageLocale: en-US
+LicenseUrl: https://github.com/golang/go/blob/go1.16/LICENSE
+Moniker: go
+Tags:
+- go
+- golang
+- go1.16
+- golang1.16
+PackageUrl: https://golang.org
+Publisher: Golang
+PackageName: Go
+License: Copyright (c) 2009 The Go Authors
+ShortDescription: Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
+
diff --git a/manifests/g/GoLang/Go/1.16.2/GoLang.Go.yaml b/manifests/g/GoLang/Go/1.16.2/GoLang.Go.yaml
index a27162344..7ef3e3a32 100644
--- a/manifests/g/GoLang/Go/1.16.2/GoLang.Go.yaml
+++ b/manifests/g/GoLang/Go/1.16.2/GoLang.Go.yaml
@@ -1,23 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: GoLang.Go
 PackageVersion: 1.16.2
-PackageName: Go
-Publisher: Golang
-License: Copyright (c) 2009 The Go Authors
-LicenseUrl: https://github.com/golang/go/blob/go1.16/LICENSE
-Moniker: go
-Tags:
-- go
-- golang
-- go1.16
-- golang1.16
-ShortDescription: Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.
-PackageUrl: https://golang.org
-Installers:
-- Architecture: x64
-  InstallerUrl: https://dl.google.com/go/go1.16.2.windows-amd64.msi
-  InstallerSha256: AD7C65AA63842E6A2AE15A32F01D1E0D8D79B032869203C7DD84E4891468719F
-  InstallerType: msi
-  ProductCode: "{7AE06CDD-83C9-49F3-8380-792E65AEA37D}"
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+