diff --git a/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.installer.yaml b/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.installer.yaml
new file mode 100644
index 000000000..b53ab5a49
--- /dev/null
+++ b/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.installer.yaml
@@ -0,0 +1,27 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: Microsoft.OpenJDK.16
+PackageVersion: 16.0.1.9
+MinimumOSVersion: 10.0.0.0
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+Installers:
+  - Architecture: x64
+    InstallerType: msi
+    InstallerUrl: https://aka.ms/download-jdk/microsoft-jdk-16.0.1.9.1-windows-x64.msi
+    InstallerSha256: 356D2BFC6E39DD30E358F4AD33DD29817758D0AC354327EA41064A9A67A49344
+    ProductCode: "{457C3F90-1C68-48D8-91BE-79FCDDF40249}"
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+  - Architecture: x86
+    InstallerType: msi
+    InstallerUrl: https://aka.ms/download-jdk/microsoft-jdk-16.0.1.9.1-windows-x86.msi
+    InstallerSha256: EC5E0EFDDDD61C247E633F69ED53CEDB80B50DCBE6BCFF3EDC2D1AF032EF06E1
+    ProductCode: "{EE5966D5-F231-4388-A49F-E91B225C5DF5}"
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+ManifestType: installer
+ManifestVersion: 1.0.0
diff --git a/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.locale.en-US.yaml b/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.locale.en-US.yaml
new file mode 100644
index 000000000..cd526bbd9
--- /dev/null
+++ b/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.locale.en-US.yaml
@@ -0,0 +1,25 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: Microsoft.OpenJDK.16
+PackageVersion: 16.0.1.9
+PackageLocale: en-US
+Publisher: Microsoft
+PublisherUrl: https://www.microsoft.com
+PublisherSupportUrl: https://support.microsoft.com
+PrivacyUrl: https://privacy.microsoft.com/en-us/privacystatement
+Author: Microsoft Corporation
+PackageName: Microsoft OpenJDK 16
+PackageUrl: https://www.microsoft.com/openjdk
+License: GPL2 with Classpath Exception.
+LicenseUrl: https://openjdk.java.net/legal/gplv2+ce.html
+#Copyright: 
+#CopyrightUrl: 
+ShortDescription: The Microsoft Build of OpenJDK is a new no-cost long-term supported distribution and Microsoft's new way to collaborate and contribute to the Java ecosystem.
+#Description: 
+Moniker: ms-openjdk-16
+Tags:
+  - Microsoft OpenJDK
+  - Java
+  - OpenJDK
+  - "16"
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
diff --git a/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.yaml b/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.yaml
index 28f320694..f877c8f2a 100644
--- a/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.yaml
+++ b/manifests/m/Microsoft/OpenJDK/16/16.0.1.9/Microsoft.OpenJDK.16.yaml
@@ -1,27 +1,6 @@
-# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.0.0.schema.json
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Microsoft.OpenJDK.16
-Publisher: Microsoft
-PackageName: Microsoft OpenJDK 16
-Author: Microsoft
-ShortDescription: The Microsoft Build of OpenJDK is a new no-cost long-term supported distribution and Microsoft's new way to collaborate and contribute to the Java ecosystem.
-Moniker: ms-openjdk-16
-Tags:
-- Java
-- OpenJDK
-- "16"
-PackageUrl: https://www.microsoft.com/openjdk
-License: GPL2 with Classpath Exception.
-LicenseUrl: https://openjdk.java.net/legal/gplv2+ce.html
-MinimumOSVersion: 10.0.0.0
 PackageVersion: 16.0.1.9
-InstallerType: msi
-Installers:
-- Architecture: x64
-  InstallerUrl: https://aka.ms/download-jdk/microsoft-jdk-16.0.1.9.1-windows-x64.msi
-  InstallerSha256: 356D2BFC6E39DD30E358F4AD33DD29817758D0AC354327EA41064A9A67A49344
-  Scope: machine
-  InstallerLocale: en-US
-  ProductCode: "{F381CC62-B6C2-4BE7-A4B0-F9D7A01B3025}"
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0