diff --git a/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.installer.yaml b/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.installer.yaml
new file mode 100644
index 000000000..b782c6f2b
--- /dev/null
+++ b/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.installer.yaml
@@ -0,0 +1,33 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: KeePassXCTeam.KeePassXC
+PackageVersion: 2.6.4
+MinimumOSVersion: 10.0.0.0
+FileExtensions:
+  - kdb
+  - kdbx
+  - lngx
+  - plgx
+  - kpdx
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+Installers:
+  - Architecture: x64
+    InstallerType: msi
+    InstallerUrl: https://github.com/keepassxreboot/keepassxc/releases/download/2.6.4/KeePassXC-2.6.4-Win64.msi
+    InstallerSha256: 5912AA09D1FFC35E12C6454AD156940F6440A2B9874E948C7315E79E84E709C0
+    ProductCode: "{568952A1-F1D6-481E-B2DF-B7A5BE94AB3B}"
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+  - Architecture: x86
+    InstallerType: msi
+    InstallerUrl: https://github.com/keepassxreboot/keepassxc/releases/download/2.6.4/KeePassXC-2.6.4-Win32.msi
+    InstallerSha256: 73744686AF131E99A3BEC6FE28D4944834F9F81A99A7790C386FE5A75B144B64
+    ProductCode: "{7079B753-3E9F-4FFD-81DB-C528C1EF6393}"
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+ManifestType: installer
+ManifestVersion: 1.0.0
diff --git a/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.locale.en-US.yaml b/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.locale.en-US.yaml
new file mode 100644
index 000000000..eeb52770b
--- /dev/null
+++ b/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.locale.en-US.yaml
@@ -0,0 +1,30 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: KeePassXCTeam.KeePassXC
+PackageVersion: 2.6.4
+PackageLocale: en-US
+Publisher: KeePassXC Team
+PublisherUrl: https://keepassxc.org
+PublisherSupportUrl: https://github.com/keepassxreboot/keepassxc/issues
+PrivacyUrl: https://keepassxc.org/privacy/
+Author: KeePassXC Team
+PackageName: KeePassXC
+PackageUrl: https://keepassxc.org
+License: GNU GPL3
+LicenseUrl: https://github.com/keepassxreboot/keepassxc/blob/develop/LICENSE.GPL-3
+Copyright: Copyright (C) 2016-2020 KeePassXC Team
+CopyrightUrl: https://github.com/keepassxreboot/keepassxc/blob/develop/COPYING
+ShortDescription: KeePassXC is a free and open-source password manager. It started as a community fork of KeePassX.
+#Description: 
+Moniker: keepassxc
+Tags:
+  - keepass
+  - password
+  - password manager
+  - password safe
+  - credentials
+  - protect
+  - cross-platform
+  - foss
+  - open source
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
diff --git a/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.yaml b/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.yaml
index f23a44638..e48821843 100644
--- a/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.yaml
+++ b/manifests/k/KeePassXCTeam/KeePassXC/2.6.4/KeePassXCTeam.KeePassXC.yaml
@@ -1,22 +1,6 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: KeePassXCTeam.KeePassXC
 PackageVersion: 2.6.4
-PackageName: KeePassXC
-Publisher: KeePassXC Team
-License: GNU GPL3
-LicenseUrl: https://github.com/keepassxreboot/keepassxc/blob/develop/LICENSE.GPL-3
-Moniker: keepassxc
-Tags:
-- keepassxc
-ShortDescription: KeePassXC is a free and open-source password manager. It started as a community fork of KeePassX.
-PackageUrl: https://keepassxc.org
-Installers:
-- Architecture: x64
-  InstallerUrl: https://github.com/keepassxreboot/keepassxc/releases/download/2.6.4/KeePassXC-2.6.4-Win64.msi
-  InstallerSha256: 5912aa09d1ffc35e12c6454ad156940f6440a2b9874e948c7315e79e84e709c0
-  InstallerType: msi
-  InstallerSwitches:
-    Silent: /quiet /norestart
-    SilentWithProgress: /passive /norestart
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0