diff --git a/src/schema-validation.jsonc b/src/schema-validation.jsonc
index d6c63c778c4..51ae64dfb76 100644
--- a/src/schema-validation.jsonc
+++ b/src/schema-validation.jsonc
@@ -10,10 +10,6 @@
     "aurora-1.2.json",
     "aurora-1.3.json",
     "aurora-2.0.json",
-    "azure-deviceupdate-update-manifest-4.json",
-    "azure-deviceupdate-update-manifest-5.json",
-    "azure-deviceupdate-import-manifest-4.0.json",
-    "azure-deviceupdate-import-manifest-5.0.json",
     "azure-iot-edge-deployment-1.0.json",
     "azure-iot-edge-deployment-2.0.json",
     "azure-iot-edge-deployment-template-1.0.json",
diff --git a/src/schemas/json/azure-deviceupdate-manifest-definitions-4.0.json b/src/schemas/json/azure-deviceupdate-manifest-definitions-4.0.json
index 15f8511ee51..e6d92e9c011 100644
--- a/src/schemas/json/azure-deviceupdate-manifest-definitions-4.0.json
+++ b/src/schemas/json/azure-deviceupdate-manifest-definitions-4.0.json
@@ -39,7 +39,7 @@
       "title": "Update compatibility",
       "description": "List of device property sets this update is compatible with.",
       "items": {
-        "$ref": "azure-deviceupdate-manifest-definitions-4.0.json#/definitions/compatibilityInfo"
+        "$ref": "#/definitions/compatibilityInfo"
       },
       "minItems": 1,
       "maxItems": 10
@@ -49,13 +49,20 @@
       "title": "Update compatibility info",
       "description": "Properties of a device this update is compatible with.",
       "additionalProperties": {
-        "type": "string",
-        "minLength": 1,
-        "maxLength": 64,
-        "propertyNames": {
-          "minLength": 1,
-          "maxLength": 32
-        }
+        "anyOf": [
+          {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64
+          },
+          {
+            "type": "object",
+            "propertyNames": {
+              "minLength": 1,
+              "maxLength": 32
+            }
+          }
+        ]
       },
       "minProperties": 1,
       "maxProperties": 5
@@ -66,7 +73,7 @@
       "description": "Update payload file, e.g. binary, firmware, script, etc. Must be unique within update.",
       "properties": {
         "filename": {
-          "$ref": "azure-deviceupdate-manifest-definitions-4.0.json#/definitions/filename"
+          "$ref": "#/definitions/filename"
         },
         "sizeInBytes": {
           "type": "number",
@@ -76,7 +83,7 @@
           "maximum": 2147483648
         },
         "hashes": {
-          "$ref": "azure-deviceupdate-manifest-definitions-4.0.json#/definitions/fileHashes"
+          "$ref": "#/definitions/fileHashes"
         }
       },
       "additionalProperties": false,
@@ -101,10 +108,17 @@
         }
       },
       "additionalProperties": {
-        "type": "string",
-        "propertyNames": {
-          "maxLength": 10
-        }
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "object",
+            "propertyNames": {
+              "maxLength": 10
+            }
+          }
+        ]
       },
       "maxProperties": 2,
       "required": ["sha256"]
diff --git a/src/schemas/json/azure-deviceupdate-manifest-definitions-5.0.json b/src/schemas/json/azure-deviceupdate-manifest-definitions-5.0.json
index 0708b3cdf89..817d626107b 100644
--- a/src/schemas/json/azure-deviceupdate-manifest-definitions-5.0.json
+++ b/src/schemas/json/azure-deviceupdate-manifest-definitions-5.0.json
@@ -49,13 +49,20 @@
       "title": "Update compatibility info",
       "description": "Properties of a device this update is compatible with.",
       "additionalProperties": {
-        "type": "string",
-        "minLength": 1,
-        "maxLength": 64,
-        "propertyNames": {
-          "minLength": 1,
-          "maxLength": 32
-        }
+        "anyOf": [
+          {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64
+          },
+          {
+            "type": "object",
+            "propertyNames": {
+              "minLength": 1,
+              "maxLength": 32
+            }
+          }
+        ]
       },
       "minProperties": 1,
       "maxProperties": 5
@@ -130,10 +137,17 @@
         }
       },
       "additionalProperties": {
-        "type": "string",
-        "propertyNames": {
-          "maxLength": 10
-        }
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "object",
+            "propertyNames": {
+              "maxLength": 10
+            }
+          }
+        ]
       },
       "maxProperties": 2,
       "required": ["sha256"]