diff --git a/manifests/m/Mozilla/Firefox/84.0.2/Mozilla.Firefox.installer.yaml b/manifests/m/Mozilla/Firefox/84.0.2/Mozilla.Firefox.installer.yaml
new file mode 100644
index 000000000..1f966409d
--- /dev/null
+++ b/manifests/m/Mozilla/Firefox/84.0.2/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: 84.0.2
+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/84.0.2/win64/en-US/Firefox%20Setup%2084.0.2.msi
+  InstallerSha256: B12F591D24170592F676978E1852F50543FEA6B3F933215DC5ECC83610F79FB4
+  Scope: machine
+  InstallerLocale: en-US
+- Architecture: x86
+  InstallerType: msi
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/84.0.2/win32/en-US/Firefox%20Setup%2084.0.2.msi
+  InstallerSha256: 529931E2CA03A13545F09467E369603C7010444F56AD807A4F9068D409D5B179
+  Scope: machine
+  InstallerLocale: en-US
+- Architecture: arm64
+  InstallerType: exe
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/84.0.2/win64-aarch64/en-US/Firefox%20Setup%2084.0.2.exe
+  InstallerSha256: 2FE22343570A15FB79203A9165262A696BACAEF4F85E0E2CC208569A0B5A1803
+  Scope: machine
+  InstallerLocale: en-US
+  InstallerSwitches:
+    Silent: /S
+    SilentWithProgress: /S
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/m/Mozilla/Firefox/84.0.2/Mozilla.Firefox.locale.en-US.yaml b/manifests/m/Mozilla/Firefox/84.0.2/Mozilla.Firefox.locale.en-US.yaml
new file mode 100644
index 000000000..10167a778
--- /dev/null
+++ b/manifests/m/Mozilla/Firefox/84.0.2/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: 84.0.2
+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/84.0.2/Mozilla.Firefox.yaml b/manifests/m/Mozilla/Firefox/84.0.2/Mozilla.Firefox.yaml
index 2c1ca29cc..4e833e186 100644
--- a/manifests/m/Mozilla/Firefox/84.0.2/Mozilla.Firefox.yaml
+++ b/manifests/m/Mozilla/Firefox/84.0.2/Mozilla.Firefox.yaml
@@ -1,34 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Mozilla.Firefox
-Publisher: Mozilla
-PackageName: Firefox
-Author: Mozilla
-ShortDescription: Mozilla Firefox is free and open source software, built by a community of thousands from all over the world.
-Moniker: firefox
-Tags:
-- Browser
-- Mozilla
-- Firefox
-FileExtensions:
-- html
-- htm
-- url
-Protocols:
-- http
-- https
-Commands:
-- firefox
-PackageUrl: https://www.mozilla.org/en-US/firefox/new/
-License: Mozilla Public License Version 2.0
-LicenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
-MinimumOSVersion: 10.0.0.0
 PackageVersion: 84.0.2
-InstallerType: msi
-Installers:
-- Architecture: x64
-  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/84.0.2/win64/en-US/Firefox%20Setup%2084.0.2.msi
-  InstallerSha256: B12F591D24170592F676978E1852F50543FEA6B3F933215DC5ECC83610F79FB4
-  Scope: machine
-  InstallerLocale: en-US
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+