diff --git a/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.installer.yaml b/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.installer.yaml
new file mode 100644
index 000000000..28e0417ad
--- /dev/null
+++ b/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.installer.yaml
@@ -0,0 +1,38 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: Mozilla.Firefox
+PackageVersion: "80.0"
+FileExtensions:
+- html
+- htm
+- url
+Protocols:
+- http
+- https
+Commands:
+- firefox
+MinimumOSVersion: 10.0.0.0
+Installers:
+- Architecture: x64
+  InstallerType: msi
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/80.0/win64/en-US/Firefox%20Setup%2080.0.msi
+  InstallerSha256: F93446A6BD0DD36A58A805C6069516AE8975929E48828F0FCBB258D4B63D48AC
+  Scope: machine
+  InstallerLocale: en-US
+- Architecture: x86
+  InstallerType: msi
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/80.0/win32/en-US/Firefox%20Setup%2080.0.msi
+  InstallerSha256: D9D00167172A51A07A1E7F8DBAF95262C46FA12788B7D4FDE34BE6469C487814
+  Scope: machine
+  InstallerLocale: en-US
+- Architecture: arm64
+  InstallerType: exe
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/80.0/win64-aarch64/en-US/Firefox%20Setup%2080.0.exe
+  InstallerSha256: 0995F9B69D5858CD90780A7CE972BE4CFF06D47C2BCB327F5DB3AD9E15C4E819
+  Scope: machine
+  InstallerLocale: en-US
+  InstallerSwitches:
+    Silent: /S
+    SilentWithProgress: /S
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.locale.en-US.yaml b/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.locale.en-US.yaml
new file mode 100644
index 000000000..dce12a053
--- /dev/null
+++ b/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.locale.en-US.yaml
@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: Mozilla.Firefox
+PackageVersion: "80.0"
+PackageLocale: en-US
+Author: Mozilla
+Moniker: firefox
+Tags:
+- Browser
+- Mozilla
+- Firefox
+PackageUrl: https://www.mozilla.org/en-US/firefox/new/
+LicenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
+Publisher: Mozilla
+PackageName: Firefox
+License: Mozilla Public License Version 2.0
+ShortDescription: Mozilla Firefox is free and open source software, built by a community of thousands from all over the world.
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
+
diff --git a/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.yaml b/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.yaml
index d6c2902ed..ef477615d 100644
--- a/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.yaml
+++ b/manifests/m/Mozilla/Firefox/80.0/Mozilla.Firefox.yaml
@@ -1,22 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Mozilla.Firefox
-PackageVersion: 80.0
-PackageName: Firefox
-Publisher: Mozilla
-Moniker: Mozilla Firefox
-Tags:
-- Mozilla Firefox
-ShortDescription: Mozilla Firefox is free and open source software, built by a community of thousands from all over the world.
-PackageUrl: https://www.mozilla.org/en-US/firefox
-License: Mozilla Public License Version 2.0
-LicenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
-Installers:
-- Architecture: x64
-  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/80.0/win64/en-US/Firefox%20Setup%2080.0.msi
-  InstallerSha256: f93446a6bd0dd36a58a805c6069516ae8975929e48828f0fcbb258d4b63d48ac
-  InstallerType: msi
-  InstallerLocale: en-US
-  InstallerSwitches:
-    Custom: /norestart
-PackageLocale: en-US
-ManifestType: singleton
+PackageVersion: "80.0"
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+