diff --git a/manifests/g/GoLang/Go/1.15.6/GoLang.Go.installer.yaml b/manifests/g/GoLang/Go/1.15.6/GoLang.Go.installer.yaml
new file mode 100644
index 000000000..44547a5d3
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.15.6/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.15.6
+Installers:
+- Architecture: x64
+  InstallerUrl: https://golang.org/dl/go1.15.6.windows-amd64.msi
+  InstallerSha256: BEDC8243116297D14A8BA15FCB280E7419DCF344A957263E2C815D74D463397E
+  InstallerType: msi
+  ProductCode: "{3E95DF12-72E2-420A-9D48-464248B10C5E}"
+- Architecture: x86
+  InstallerUrl: https://golang.org/dl/go1.15.6.windows-386.msi
+  InstallerSha256: 968E08C7BBDEC292725F0419219CAD6D6F1F516374346EC88C18FB1A09031466
+  InstallerType: msi
+  ProductCode: "{442B6B88-AA09-4E8A-8C41-C1C7810540B7}"
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/g/GoLang/Go/1.15.6/GoLang.Go.locale.en-US.yaml b/manifests/g/GoLang/Go/1.15.6/GoLang.Go.locale.en-US.yaml
new file mode 100644
index 000000000..19b46006f
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.15.6/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.15.6
+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.15.6/GoLang.Go.yaml b/manifests/g/GoLang/Go/1.15.6/GoLang.Go.yaml
index 7518098bc..d6bb224d4 100644
--- a/manifests/g/GoLang/Go/1.15.6/GoLang.Go.yaml
+++ b/manifests/g/GoLang/Go/1.15.6/GoLang.Go.yaml
@@ -1,22 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: GoLang.Go
 PackageVersion: 1.15.6
-PackageName: Go
-Publisher: Golang
-License: Copyright (c) 2009 The Go Authors
-LicenseUrl: https://github.com/golang/go/blob/go1.15.6/LICENSE
-Moniker: go
-Tags:
-- go
-- golang
-- go1.15
-- golang1.15
-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.15.6.windows-amd64.msi
-  InstallerSha256: bedc8243116297d14a8ba15fcb280e7419dcf344a957263e2c815d74d463397e
-  InstallerType: msi
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+