diff --git a/manifests/g/GNU/Octave/6.2.0/GNU.Octave.installer.yaml b/manifests/g/GNU/Octave/6.2.0/GNU.Octave.installer.yaml
new file mode 100644
index 000000000..110c86314
--- /dev/null
+++ b/manifests/g/GNU/Octave/6.2.0/GNU.Octave.installer.yaml
@@ -0,0 +1,29 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: GNU.Octave
+PackageVersion: 6.2.0
+MinimumOSVersion: 10.0.0.0
+FileExtensions:
+  - m
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+Installers:
+  - Architecture: x64
+    InstallerType: nullsoft
+    InstallerUrl: https://ftpmirror.gnu.org/octave/windows/octave-6.2.0-w64-installer.exe
+    InstallerSha256: CC5484B3F8D23CB7FF85E1813EEBCB522E84D5650F0CC6F059EBC1D1812AA931
+#    ProductCode: 
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+  - Architecture: x86
+    InstallerType: nullsoft
+    InstallerUrl: https://ftpmirror.gnu.org/octave/windows/octave-6.2.0-w32-installer.exe
+    InstallerSha256: EEF476072F33959FDFDB1E8E38BB853FAB435E6494B0CE19FBDE77E6E0ED818B
+#    ProductCode: 
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+ManifestType: installer
+ManifestVersion: 1.0.0
diff --git a/manifests/g/GNU/Octave/6.2.0/GNU.Octave.locale.en-US.yaml b/manifests/g/GNU/Octave/6.2.0/GNU.Octave.locale.en-US.yaml
new file mode 100644
index 000000000..7415fa7d6
--- /dev/null
+++ b/manifests/g/GNU/Octave/6.2.0/GNU.Octave.locale.en-US.yaml
@@ -0,0 +1,25 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: GNU.Octave
+PackageVersion: 6.2.0
+PackageLocale: en-US
+Publisher: GNU Project
+PublisherUrl: https://www.gnu.org/
+PublisherSupportUrl: https://www.gnu.org/software/octave/support
+#PrivacyUrl: 
+Author: John W. Eaton
+PackageName: GNU Octave
+PackageUrl: https://www.gnu.org/software/octave/
+License: GPL-3.0-only
+LicenseUrl: https://www.gnu.org/software/octave/license.html
+Copyright: Copyright (c) 1998-2021 John W. Eaton
+#CopyrightUrl: 
+ShortDescription: A high-level language primarily intended for numerical computations.
+Description: GNU Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other numerical experiments using a language that is mostly compatible with Matlab. It may also be used as a batch-oriented language.
+Moniker: octave
+Tags:
+  - octave
+  - matlab
+  - math
+  - numerical computation
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
diff --git a/manifests/g/GNU/Octave/6.2.0/GNU.Octave.yaml b/manifests/g/GNU/Octave/6.2.0/GNU.Octave.yaml
index 82a74cdea..9b915b0fb 100644
--- a/manifests/g/GNU/Octave/6.2.0/GNU.Octave.yaml
+++ b/manifests/g/GNU/Octave/6.2.0/GNU.Octave.yaml
@@ -1,18 +1,6 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: GNU.Octave
 PackageVersion: 6.2.0
-PackageName: GNU Octave
-Publisher: GNU
-License: GPL
-LicenseUrl: https://www.gnu.org/software/octave/license.html
-Moniker: octave
-ShortDescription: GNU.Octave
-Description: GNU Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other numerical experiments using a language that is mostly compatible with Matlab. It may also be used as a batch-oriented language.
-PackageUrl: https://www.gnu.org/software/octave/
-Installers:
-- Architecture: x64
-  InstallerUrl: https://ftpmirror.gnu.org/octave/windows/octave-6.2.0-w64-installer.exe
-  InstallerSha256: cc5484b3f8d23cb7ff85e1813eebcb522e84d5650f0cc6f059ebc1d1812aa931
-  InstallerType: nullsoft
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0