diff --git a/manifests/g/GoLang/Go/1.15.7/GoLang.Go.installer.yaml b/manifests/g/GoLang/Go/1.15.7/GoLang.Go.installer.yaml
new file mode 100644
index 000000000..17ffec7e6
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.15.7/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.7
+Installers:
+- Architecture: x64
+  InstallerUrl: https://golang.org/dl/go1.15.7.windows-amd64.msi
+  InstallerSha256: 548E73797F07C8F7DCD4E419F396A41702AB68D1BC82FF637587B94BCDC9A462
+  InstallerType: msi
+  ProductCode: "{1A726640-2F1F-4820-AC82-B7179DD11893}"
+- Architecture: x86
+  InstallerUrl: https://golang.org/dl/go1.15.7.windows-386.msi
+  InstallerSha256: 1400F3A5A461214B97463167A8EE9F87B6F52D46E512F17CF5D9B77285B054F3
+  InstallerType: msi
+  ProductCode: "{69D51715-FE0C-4C6F-A444-0F62AC6185E1}"
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/g/GoLang/Go/1.15.7/GoLang.Go.locale.en-US.yaml b/manifests/g/GoLang/Go/1.15.7/GoLang.Go.locale.en-US.yaml
new file mode 100644
index 000000000..4553e4314
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.15.7/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.7
+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.7/GoLang.Go.yaml b/manifests/g/GoLang/Go/1.15.7/GoLang.Go.yaml
index 5e420be2d..d987b03c8 100644
--- a/manifests/g/GoLang/Go/1.15.7/GoLang.Go.yaml
+++ b/manifests/g/GoLang/Go/1.15.7/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.7
-PackageName: Go
-Publisher: Golang
-License: Copyright (c) 2009 The Go Authors
-LicenseUrl: https://github.com/golang/go/blob/go1.15.7/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.7.windows-amd64.msi
-  InstallerSha256: 548e73797f07c8f7dcd4e419f396a41702ab68d1bc82ff637587b94bcdc9a462
-  InstallerType: msi
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+