diff --git a/manifests/g/GoLang/Go/1.15.0/GoLang.Go.installer.yaml b/manifests/g/GoLang/Go/1.15.0/GoLang.Go.installer.yaml
new file mode 100644
index 000000000..c392d2267
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.15.0/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.0
+Installers:
+- Architecture: x64
+  InstallerUrl: https://dl.google.com/go/go1.15.windows-amd64.msi
+  InstallerSha256: 02944771CA3CFFE7BCDA85C6EC16EB6DAC94E4B1C877CCEB610ECAB92D4E0A32
+  InstallerType: msi
+  ProductCode: "{82512CD9-A1E6-4305-9D4D-51E6EF13787A}"
+- Architecture: x86
+  InstallerUrl: https://dl.google.com/go/go1.15.windows-386.msi
+  InstallerSha256: 33780D3A21B05FC0BB9F76380390D3233BC62347EA58349C6317FFADD8CB2429
+  InstallerType: msi
+  ProductCode: "{2B230F90-EC69-4B87-B178-27AE9A8F5A73}"
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/g/GoLang/Go/1.15.0/GoLang.Go.locale.en-US.yaml b/manifests/g/GoLang/Go/1.15.0/GoLang.Go.locale.en-US.yaml
new file mode 100644
index 000000000..db27dfc78
--- /dev/null
+++ b/manifests/g/GoLang/Go/1.15.0/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.0
+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.0/GoLang.Go.yaml b/manifests/g/GoLang/Go/1.15.0/GoLang.Go.yaml
index f68626900..5c42cd004 100644
--- a/manifests/g/GoLang/Go/1.15.0/GoLang.Go.yaml
+++ b/manifests/g/GoLang/Go/1.15.0/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.0
-PackageName: Go
-Publisher: Golang
-License: Copyright (c) 2009 The Go Authors
-LicenseUrl: https://github.com/golang/go/blob/go1.15/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.windows-amd64.msi
-  InstallerSha256: 02944771CA3CFFE7BCDA85C6EC16EB6DAC94E4B1C877CCEB610ECAB92D4E0A32
-  InstallerType: msi
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+