diff --git a/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.installer.yaml b/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.installer.yaml
new file mode 100644
index 000000000..b779aa087
--- /dev/null
+++ b/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.installer.yaml
@@ -0,0 +1,21 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: AdoptOpenJDK.OpenJDK
+PackageVersion: 16.0.0.36
+Installers:
+- Architecture: x64
+  InstallerUrl: https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi
+  InstallerSha256: 7E10EC7E61BAAD6293C8B2812EEE7D049450602C9493F658F5476C48F0C450B1
+  ProductCode: "{55E24AB0-65D7-465F-AAE6-36C2D57212B3}"
+  InstallerType: msi
+  InstallerSwitches:
+    Custom: INSTALLLEVEL=3
+- Architecture: x86
+  InstallerUrl: https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x86-32_windows_hotspot_16_36.msi
+  InstallerSha256: 1513F340858B5CF0DAA63F179E6664AD5B37001EE208897C235834F3DD6CE98B
+  ProductCode: "{C89677BC-CBB0-4060-8E53-CF9386C390F4}"
+  InstallerType: msi
+  InstallerSwitches:
+    Custom: INSTALLLEVEL=3
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.locale.en-US.yaml b/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.locale.en-US.yaml
new file mode 100644
index 000000000..3e951da33
--- /dev/null
+++ b/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.locale.en-US.yaml
@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: AdoptOpenJDK.OpenJDK
+PackageVersion: 16.0.0.36
+PackageLocale: en-US
+LicenseUrl: https://adoptopenjdk.net/about.html
+Moniker: adoptopenjdk16
+Tags:
+- openjdk
+- java
+- jvm
+- jdk
+PackageUrl: https://adoptopenjdk.net
+Publisher: AdoptOpenJDK
+PackageName: AdoptOpenJDK 16.0.0+36 (x64)
+License: GPL 2 with Classpath Exception
+ShortDescription: AdoptOpenJDK with Oracle HotSpot JVM
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
+
diff --git a/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.yaml b/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.yaml
index dba8279c7..28449ec62 100644
--- a/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.yaml
+++ b/manifests/a/AdoptOpenJDK/OpenJDK/16.0.0.36/AdoptOpenJDK.OpenJDK.yaml
@@ -1,25 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: AdoptOpenJDK.OpenJDK
 PackageVersion: 16.0.0.36
-PackageName: AdoptOpenJDK 16.0.0+36 (x64)
-Publisher: AdoptOpenJDK
-License: GPL 2 with Classpath Exception
-LicenseUrl: https://adoptopenjdk.net/about.html
-Moniker: adoptopenjdk16
-Tags:
-- openjdk
-- java
-- jvm
-- jdk
-ShortDescription: AdoptOpenJDK with Oracle HotSpot JVM
-PackageUrl: https://adoptopenjdk.net
-Installers:
-- Architecture: x64
-  InstallerUrl: https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi
-  InstallerSha256: 7E10EC7E61BAAD6293C8B2812EEE7D049450602C9493F658F5476C48F0C450B1
-  ProductCode: "{F80265D4-3CED-44EE-B9CA-30D867F8BD95}"
-  InstallerType: msi
-  InstallerSwitches:
-    Custom: INSTALLLEVEL=3
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+