diff --git a/src/schema-validation.jsonc b/src/schema-validation.jsonc
index de4bb92d48f..c0db578a16b 100644
--- a/src/schema-validation.jsonc
+++ b/src/schema-validation.jsonc
@@ -254,8 +254,6 @@
     "vega-lite.json",
     "vs-nesting.json",
     "vsext.json",
-    "vsix-manifestinjection.json",
-    "vsix-publish.json",
     "vss-extension.json",
     "vtesttree-schema-v1.0.0.json",
     "vtesttree-schema-v2.0.0.json",
diff --git a/src/schemas/json/vsix-manifestinjection.json b/src/schemas/json/vsix-manifestinjection.json
index 9f7f104374c..178b670f616 100644
--- a/src/schemas/json/vsix-manifestinjection.json
+++ b/src/schemas/json/vsix-manifestinjection.json
@@ -1,7 +1,9 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://json.schemastore.org/vsix-manifestinjection.json",
   "definitions": {
     "fileAssociation": {
+      "type": "object",
       "required": ["extension", "progId"],
       "properties": {
         "contentType": {
@@ -33,6 +35,7 @@
       }
     },
     "urlAssociation": {
+      "type": "object",
       "required": ["protocol", "progId", "defaultProgramRegistrationPath"],
       "properties": {
         "defaultProgramRegistrationPath": {
@@ -61,6 +64,7 @@
       }
     },
     "progIds": {
+      "type": "object",
       "required": ["id"],
       "properties": {
         "allowSilentDefaultTakeOver": {
@@ -129,7 +133,6 @@
       }
     }
   },
-  "id": "https://json.schemastore.org/vsix-manifestinjection.json",
   "properties": {
     "fileAssociations": {
       "description": "A list of file associations (protocol handlers).",
diff --git a/src/schemas/json/vsix-publish.json b/src/schemas/json/vsix-publish.json
index b3d34463a62..f79e8250cc1 100644
--- a/src/schemas/json/vsix-publish.json
+++ b/src/schemas/json/vsix-publish.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "https://json.schemastore.org/vsix-publish.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://json.schemastore.org/vsix-publish.json",
   "properties": {
     "identity": {
       "type": "object",
@@ -79,10 +79,17 @@
           "pattern": "^[^\\s-]+$"
         },
         "language": {
-          "type": ["string", "number"],
+          "anyOf": [
+            {
+              "type": "string",
+              "pattern": "^(\\d{4})$|^([a-zA-Z]{2}(-[A-Za-z]{2})?)$|^neutral$"
+            },
+            {
+              "type": "number"
+            }
+          ],
           "title": "Language",
-          "description": "The default language the extension applies to. Must be a CLR locale code or an lcid code.",
-          "pattern": "^(\\d{4})$|^([a-zA-Z]{2}(-[A-Za-z]{2})?)$|^neutral$"
+          "description": "The default language the extension applies to. Must be a CLR locale code or an lcid code."
         },
         "tags": {
           "type": "array",